[QGIS Commit] [qgis/Quantum-GIS] b33ea4: Updated version number, splash icon, for master

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: b33ea422ce7deae573c1c061295dbd77a941858e
      https://github.com/qgis/Quantum-GIS/commit/b33ea422ce7deae573c1c061295dbd77a941858e
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
    M CMakeLists.txt
    M images/icons/qgis-icon-60x60.png
    M images/icons/qgis-icon-60x60.xcf
    M images/splash/splash.png

  Log Message:
  -----------
  Updated version number, splash icon, for master


  Commit: dba6ba4fb1f3af70f96bea9173ab27f7a8542fc7
      https://github.com/qgis/Quantum-GIS/commit/dba6ba4fb1f3af70f96bea9173ab27f7a8542fc7
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
    M doc/TRANSLATORS
    M i18n/qgis_de.ts
    M i18n/qgis_nl.ts
    M src/app/composer/qgscomposer.cpp
    M src/core/qgsexpression.cpp
    M src/gui/qgsexpressionbuilderwidget.cpp
    M src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/ui/qgsexpressionbuilder.ui

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


  Commit: f3f1c4378e1067a5a455f880669dc2a119f8348b
      https://github.com/qgis/Quantum-GIS/commit/f3f1c4378e1067a5a455f880669dc2a119f8348b
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
    M CMakeLists.txt
    M debian/changelog
    M python/core/core.sip
    M python/core/qgsrasterlayer.sip
    M src/app/CMakeLists.txt
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgsrasterlayerproperties.cpp
    M src/app/qgsrasterlayerproperties.h
    M src/core/CMakeLists.txt
    M src/core/qgsmaplayer.h
    M src/core/qgsprojectfiletransform.cpp
    M src/core/qgsprojectfiletransform.h
    M src/core/qgsrasterprojector.h
    A src/core/raster/qgsbilinearrasterresampler.cpp
    A src/core/raster/qgsbilinearrasterresampler.h
    M src/core/raster/qgscolorrampshader.cpp
    M src/core/raster/qgscolorrampshader.h
    M src/core/raster/qgscontrastenhancement.cpp
    M src/core/raster/qgscontrastenhancement.h
    A src/core/raster/qgscubicrasterresampler.cpp
    A src/core/raster/qgscubicrasterresampler.h
    A src/core/raster/qgsmultibandcolorrenderer.cpp
    A src/core/raster/qgsmultibandcolorrenderer.h
    A src/core/raster/qgspalettedrasterrenderer.cpp
    A src/core/raster/qgspalettedrasterrenderer.h
    M src/core/raster/qgsrasterlayer.cpp
    M src/core/raster/qgsrasterlayer.h
    A src/core/raster/qgsrasterrenderer.cpp
    A src/core/raster/qgsrasterrenderer.h
    A src/core/raster/qgsrasterrendererregistry.cpp
    A src/core/raster/qgsrasterrendererregistry.h
    A src/core/raster/qgsrasterresampler.h
    M src/core/raster/qgsrastershader.cpp
    M src/core/raster/qgsrastershader.h
    M src/core/raster/qgsrastershaderfunction.h
    M src/core/raster/qgsrastertransparency.cpp
    M src/core/raster/qgsrastertransparency.h
    A src/core/raster/qgssinglebandcolordatarenderer.cpp
    A src/core/raster/qgssinglebandcolordatarenderer.h
    A src/core/raster/qgssinglebandgrayrenderer.cpp
    A src/core/raster/qgssinglebandgrayrenderer.h
    A src/core/raster/qgssinglebandpseudocolorrenderer.cpp
    A src/core/raster/qgssinglebandpseudocolorrenderer.h
    M src/gui/CMakeLists.txt
    M src/gui/qgsexpressionbuilderwidget.cpp
    A src/gui/raster/qgsmultibandcolorrendererwidget.cpp
    A src/gui/raster/qgsmultibandcolorrendererwidget.h
    A src/gui/raster/qgspalettedrendererwidget.cpp
    A src/gui/raster/qgspalettedrendererwidget.h
    A src/gui/raster/qgsrasterrendererwidget.h
    A src/gui/raster/qgssinglebandgrayrendererwidget.cpp
    A src/gui/raster/qgssinglebandgrayrendererwidget.h
    A src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
    A src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
    A src/ui/qgsmultibandcolorrendererwidgetbase.ui
    A src/ui/qgspalettedrendererwidgetbase.ui
    M src/ui/qgsrasterlayerpropertiesbase.ui
    A src/ui/qgssinglebandgrayrendererwidgetbase.ui
    A src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
    M tests/src/core/regression992.cpp

  Log Message:
  -----------
  Resolved merge conflicts


  Commit: 42a5eb9203ac6840d6f25119328dd882081eee94
      https://github.com/qgis/Quantum-GIS/commit/42a5eb9203ac6840d6f25119328dd882081eee94
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
    M python/core/qgsrasterlayer.sip
    A python/core/qgsrasterrenderer.sip
    A python/core/qgsrasterresampler.sip
    M python/gui/qgisinterface.sip
    M src/app/legend/qgslegend.cpp
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgisappinterface.cpp
    M src/app/qgisappinterface.h
    M src/app/qgsbrowserdockwidget.cpp
    M src/browser/qgsbrowser.cpp
    M src/core/qgsbrowsermodel.cpp
    M src/core/qgsdatasourceuri.cpp
    M src/core/qgsdatasourceuri.h
    M src/core/qgsmaplayer.cpp
    M src/core/qgsprojectfiletransform.cpp
    M src/core/qgsprojectfiletransform.h
    M src/core/raster/qgsbilinearrasterresampler.h
    M src/core/raster/qgscubicrasterresampler.h
    M src/core/raster/qgsmultibandcolorrenderer.cpp
    M src/core/raster/qgsmultibandcolorrenderer.h
    M src/core/raster/qgspalettedrasterrenderer.cpp
    M src/core/raster/qgspalettedrasterrenderer.h
    M src/core/raster/qgsrasterlayer.cpp
    M src/core/raster/qgsrasterlayer.h
    M src/core/raster/qgsrasterrenderer.cpp
    M src/core/raster/qgsrasterrenderer.h
    M src/core/raster/qgsrasterrendererregistry.h
    M src/core/raster/qgsrastershader.cpp
    M src/core/raster/qgssinglebandgrayrenderer.cpp
    M src/core/raster/qgssinglebandgrayrenderer.h
    M src/core/raster/qgssinglebandpseudocolorrenderer.cpp
    M src/core/raster/qgssinglebandpseudocolorrenderer.h
    M src/gui/qgisinterface.h
    M src/gui/raster/qgsmultibandcolorrendererwidget.h
    M src/gui/raster/qgspalettedrendererwidget.h
    M src/gui/raster/qgsrasterrendererwidget.h
    M src/gui/raster/qgssinglebandgrayrendererwidget.h
    M src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
    M src/mapserver/qgsremoteowsbuilder.cpp
    M src/plugins/grass/qgsgrassbrowser.cpp
    M src/plugins/grass/qgsgrassmodule.cpp
    M src/plugins/grass/qgsgrassplugin.cpp
    M src/providers/wms/qgswmsconnection.cpp
    M src/providers/wms/qgswmsconnection.h
    M src/providers/wms/qgswmsdataitems.cpp
    M src/providers/wms/qgswmsdataitems.h
    M src/providers/wms/qgswmsprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/providers/wms/qgswmssourceselect.cpp
    M src/providers/wms/qgswmssourceselect.h

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


Compare: https://github.com/qgis/Quantum-GIS/compare/9a006e4dad2a...42a5eb9203ac