[QGIS Commit] [qgis/Quantum-GIS] 8465bd: Revise script to get rid of orig files

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 8465bdc741ee05a3e167bba70f4f0325ac66ef05
      https://github.com/qgis/Quantum-GIS/commit/8465bdc741ee05a3e167bba70f4f0325ac66ef05
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    A scripts/remove_git_confict_files.sh
  R scripts/remove_svn_conflict_files.sh

  Log Message:
  -----------
  Revise script to get rid of orig files


  Commit: ceae2a76613c64d39ec5e89a175e7845219919b1
      https://github.com/qgis/Quantum-GIS/commit/ceae2a76613c64d39ec5e89a175e7845219919b1
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    A tests/testdata/landsat.tif.aux.xml
  A tests/testdata/tenbytenraster.asc.aux.xml

  Log Message:
  -----------
  Added test datasets aux.xml files for what its worth


  Commit: 4b8ab18829050151d18c200d541c68dda510089f
      https://github.com/qgis/Quantum-GIS/commit/4b8ab18829050151d18c200d541c68dda510089f
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Added verbose output on test failure to make check command


Compare: https://github.com/qgis/Quantum-GIS/compare/4590397...4b8ab18