[QGIS Commit] [qgis/Quantum-GIS] b41472: Enable new repo by default now too

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS

  Commit: b41472fd843dfae95b4d859599212bb34843259d
      https://github.com/qgis/Quantum-GIS/commit/b41472fd843dfae95b4d859599212bb34843259d
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-11-12 (Sat, 12 Nov 2011)

  Changed paths:
    M python/plugins/plugin_installer/installer_data.py

  Log Message:
  -----------
  Enable new repo by default now too


  Commit: cf7b989a7e2c787c7f9882175d36e7e7d0e22b36
      https://github.com/qgis/Quantum-GIS/commit/cf7b989a7e2c787c7f9882175d36e7e7d0e22b36
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-11-12 (Sat, 12 Nov 2011)

  Changed paths:
    M scripts/remove_svn_conflict_files.sh

  Log Message:
  -----------
  Added another way to find org files (but commented out)


  Commit: 6274cd112f1cca6ae09b89ba35df946f48cab482
      https://github.com/qgis/Quantum-GIS/commit/6274cd112f1cca6ae09b89ba35df946f48cab482
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-11-12 (Sat, 12 Nov 2011)

  Changed paths:
    M python/plugins/fTools/__init__.py
  M python/plugins/fTools/fTools.py
  M python/plugins/fTools/tools/doDefineProj.py
  M python/plugins/fTools/tools/doGeometry.py
  M python/plugins/fTools/tools/doGeoprocessing.py
  M python/plugins/fTools/tools/doIntersectLines.py
  M python/plugins/fTools/tools/doMeanCoords.py
  M python/plugins/fTools/tools/doMergeShapes.py
  M python/plugins/fTools/tools/doPointDistance.py
  M python/plugins/fTools/tools/doPointsInPolygon.py
  M python/plugins/fTools/tools/doRandPoints.py
  M python/plugins/fTools/tools/doRandom.py
  M python/plugins/fTools/tools/doRegPoints.py
  M python/plugins/fTools/tools/doSelectByLocation.py
  M python/plugins/fTools/tools/doSimplify.py
  A python/plugins/fTools/tools/doSpatialIndex.py
  M python/plugins/fTools/tools/doSpatialJoin.py
  M python/plugins/fTools/tools/doSubsetSelect.py
  M python/plugins/fTools/tools/doSumLines.py
  M python/plugins/fTools/tools/doVectorGrid.py
  M python/plugins/fTools/tools/doVectorSplit.py
  M python/plugins/fTools/tools/doVisual.py
  M python/plugins/fTools/tools/frmSimplify.ui
  A python/plugins/fTools/tools/frmSpatialIndex.ui
  M python/plugins/fTools/tools/ftools_utils.py
  M python/plugins/fTools/tools/voronoi.py
  M src/mapserver/qgssldparser.cpp

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


Compare: https://github.com/qgis/Quantum-GIS/compare/d3fe194...6274cd1