[QGIS Commit] [qgis/Quantum-GIS] 3ff85b: [BP17]Added Voralberg as silver sponsor

[noreply at github.com]

  Branch: refs/heads/release-1_7
  Home:   https://github.com/qgis/Quantum-GIS

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

  Changed paths:
    M doc/SPONSORS

  Log Message:
  -----------
  [BP17]Added Voralberg as silver sponsor


  Commit: ec4c635eff204ef4876a31c11175768532b88540
      https://github.com/qgis/Quantum-GIS/commit/ec4c635eff204ef4876a31c11175768532b88540
  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
  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/ftools_utils.py
  M python/plugins/fTools/tools/voronoi.py
  M src/app/qgisapp.cpp

  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/5289b1a...ec4c635