[QGIS Commit] [qgis/Quantum-GIS] f0d6ce: translation update: added norwegian on request

[noreply at github.com]

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

  Commit: f0d6cea53f27f80a18e406b16052acf26f5a639f
      https://github.com/qgis/Quantum-GIS/commit/f0d6cea53f27f80a18e406b16052acf26f5a639f
  Author: Werner Macho <werner.macho at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    A i18n/qgis_no.ts

  Log Message:
  -----------
  translation update: added norwegian on request


  Commit: b84327d6e44d6e1553d416183de3a3887e5771ed
      https://github.com/qgis/Quantum-GIS/commit/b84327d6e44d6e1553d416183de3a3887e5771ed
  Author: Werner Macho <werner.macho at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M python/CMakeLists.txt
  M src/mapserver/qgsprojectparser.cpp
  M src/mapserver/qgsprojectparser.h

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


Compare: https://github.com/qgis/Quantum-GIS/compare/275585c...b84327d