[QGIS Commit] [qgis/Quantum-GIS] 88e3e3: Backported osgEarth::QtGui::ViewerWidget and osgEa...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 88e3e348df95ab19c944709cb7f45bfaba1977f3
      https://github.com/qgis/Quantum-GIS/commit/88e3e348df95ab19c944709cb7f45bfaba1977f3
  Author: Pirmin Kalberer <pka at sourcepole.ch>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M src/plugins/globe/CMakeLists.txt
    M src/plugins/globe/globe_plugin.cpp
    M src/plugins/globe/globe_plugin.h
    M src/plugins/globe/globe_plugin_dialog.cpp
    M src/plugins/globe/globe_plugin_dialog.h
    A src/plugins/globe/osgEarthQt/Common
    A src/plugins/globe/osgEarthQt/ViewerWidget
    A src/plugins/globe/osgEarthQt/ViewerWidget.cpp
    A src/plugins/globe/osgEarthUtil/Controls
    A src/plugins/globe/osgEarthUtil/Controls.cpp
    M src/plugins/globe/qgsosgearthtilesource.cpp
    R src/plugins/globe/qgsosgviewer.cpp
    R src/plugins/globe/qgsosgviewer.h

  Log Message:
  -----------
  Backported osgEarth::QtGui::ViewerWidget and osgEarth::Util::Controls for compatibilty with news OSG and QT version


  Commit: 101cc38c48e13c1ea631edff15be49411f4de88a
      https://github.com/qgis/Quantum-GIS/commit/101cc38c48e13c1ea631edff15be49411f4de88a
  Author: Pirmin Kalberer <pka at sourcepole.ch>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M python/plugins/sextante/modeler/ModelerParametersDialog.py

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


Compare: https://github.com/qgis/Quantum-GIS/compare/636919621035...101cc38c48e1