[QGIS Commit] [qgis/QGIS] b4d7e0: fix windows build (also syncs QgsComposition sip b...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/QGIS
  Commit: b4d7e02d3a3cefdbd5f137ff43cc83b8fd8a2691
      https://github.com/qgis/QGIS/commit/b4d7e02d3a3cefdbd5f137ff43cc83b8fd8a2691
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M python/core/composer/qgscomposition.sip
    M src/core/composer/qgscomposerscalebar.cpp
    M src/core/composer/qgscomposition.h

  Log Message:
  -----------
  fix windows build (also syncs QgsComposition sip binding)