[QGIS Commit] [qgis/Quantum-GIS] 0e537f: Resolved merge conflict

[GitHub]

  Branch: refs/heads/release-1_7
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 0e537f2f951116fab3e1fdb785c8bc06d13d7cc5
      https://github.com/qgis/Quantum-GIS/commit/0e537f2f951116fab3e1fdb785c8bc06d13d7cc5
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M doc/TRANSLATORS

  Log Message:
  -----------
  Resolved merge conflict


  Commit: dac2712dea4502bf5e9f60fdc7698ee75678bcd9
      https://github.com/qgis/Quantum-GIS/commit/dac2712dea4502bf5e9f60fdc7698ee75678bcd9
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ms-windows/osgeo4w/qgis.bat.tmpl

  Log Message:
  -----------
  Merge branch 'release-1_7' of github.com:qgis/Quantum-GIS into release-1_7


Compare: https://github.com/qgis/Quantum-GIS/compare/6becc85...dac2712