[QGIS Commit] [qgis/QGIS] 5b4d07: revert 637359a and manually merge pull request #12...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/QGIS
  Commit: 5b4d076898e7489f94ea12ab773ec5872d4dc88c
      https://github.com/qgis/QGIS/commit/5b4d076898e7489f94ea12ab773ec5872d4dc88c
  Author: Richard Duivenvoorde <richard at duif.net>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/main.cpp
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/ui/qgisapp.ui
    M src/ui/qgscomposerbase.ui
    M src/ui/qgsoptionsbase.ui

  Log Message:
  -----------
  revert 637359a and manually merge pull request #1232

Signed-off-by: Juergen E. Fischer <jef at norbit.de>


  Commit: f66ad8e483aa4ca479b7546a19293ec9464a7a52
      https://github.com/qgis/QGIS/commit/f66ad8e483aa4ca479b7546a19293ec9464a7a52
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M i18n/qgis_de.ts

  Log Message:
  -----------
  german translation update


Compare: https://github.com/qgis/QGIS/compare/f020bbf95af2...f66ad8e483aa