[QGIS Commit] [qgis/Quantum-GIS] d77973: Revert "Fix from lynxlynxlynxlynxlynx for building...

[GitHub]

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

  Changed paths:
    M src/providers/grass/CMakeLists.txt

  Log Message:
  -----------
  Revert "Fix from lynxlynxlynxlynxlynx for building grass on mac"

This reverts commit 977518af3a669aac1045eebb5b00fce2b6d50680.


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

  Changed paths:
    M src/ui/qgsdiagrampropertiesbase.ui
    M src/ui/qgsengineconfigdialog.ui
    M src/ui/qgslabelingguibase.ui

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


Compare: https://github.com/qgis/Quantum-GIS/compare/ea2de726d3a2...e690048b4641