[QGIS Commit] [qgis/Quantum-GIS] ff4c36: Merge branch 'master' of github.com:qgis/Quantum-G...

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS

  Commit: ff4c360fb9b1dbebe40b91e973c5b1d590e48c43
      https://github.com/qgis/Quantum-GIS/commit/ff4c360fb9b1dbebe40b91e973c5b1d590e48c43
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-11-30 (Wed, 30 Nov 2011)

  Changed paths:
    M i18n/qgis_de.ts
  M python/core/qgscomposerscalebar.sip
  M src/app/composer/qgscomposerscalebarwidget.cpp
  M src/app/composer/qgscomposerscalebarwidget.h
  M src/app/composer/qgscomposershapewidget.cpp
  M src/app/legend/qgslayerorder.cpp
  M src/app/legend/qgslayerorder.h
  M src/app/legend/qgslegend.cpp
  M src/app/legend/qgslegend.h
  M src/app/qgisapp.cpp
  M src/core/composer/qgscomposerscalebar.cpp
  M src/core/composer/qgscomposerscalebar.h
  M src/core/composer/qgsnumericscalebarstyle.cpp
  M src/core/composer/qgsnumericscalebarstyle.h
  M src/core/qgsdatasourceuri.cpp
  M src/core/qgsdatasourceuri.h
  M src/core/qgsdbtablemodel.cpp
  M src/core/qgsdbtablemodel.h
  M src/gui/attributetable/qgsattributetablememorymodel.cpp
  M src/gui/attributetable/qgsattributetablememorymodel.h
  M src/gui/attributetable/qgsattributetablemodel.cpp
  M src/gui/attributetable/qgsattributetablemodel.h
  M src/gui/attributetable/qgsattributetableview.cpp
  M src/gui/qgscomposerview.cpp
  M src/gui/qgscomposerview.h
  M src/providers/postgres/qgspgsourceselect.cpp
  M src/providers/postgres/qgspgsourceselect.h
  M src/providers/postgres/qgspostgresprovider.cpp
  M src/providers/postgres/qgspostgresprovider.h
  M src/ui/qgscomposerscalebarwidgetbase.ui

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


  Commit: 763caa71f67722c1d8ba45ec5e0eccee624f34bb
      https://github.com/qgis/Quantum-GIS/commit/763caa71f67722c1d8ba45ec5e0eccee624f34bb
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-11-30 (Wed, 30 Nov 2011)

  Changed paths:
    M src/ui/qgsprojectpropertiesbase.ui

  Log Message:
  -----------
  [UI] put wms options for project properties into a scroll widget so dialog can be resized vertically


Compare: https://github.com/qgis/Quantum-GIS/compare/8e4e8e1...763caa7