Skip to content

Commit

Permalink
Release of 2.12 (Lyon)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 23, 2015
1 parent c69f339 commit cd9d645
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "11")
SET(CPACK_PACKAGE_VERSION_MINOR "12")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Master")
SET(RELEASE_NAME "Lyon")
IF (POLICY CMP0048) # in CMake 3.0.0+
CMAKE_POLICY (SET CMP0048 OLD) # keep PROJECT() from clearing VERSION variables
ENDIF (POLICY CMP0048)
Expand Down
10 changes: 8 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
qgis (2.11.0) UNRELEASED; urgency=medium
qgis (2.12.0) UNRELEASED; urgency=medium

* Release of 2.12.0

-- Jürgen E. Fischer <[email protected]> Fri, 23 Oct 2015 14:10:38 +0200

qgis (2.11.0) unstable; urgency=medium

* New development version 2.11 after branch of 2.10
* moved grass default.qgc from config to modules
Expand All @@ -11,7 +17,7 @@ qgis (2.11.0) UNRELEASED; urgency=medium
* include geometry checker and snapper plugins
* merge downstream debian changes from Bas Couwenberg

-- Jürgen E. Fischer <[email protected]> Thu, 22 Oct 2015 22:33:23 +0200
-- Jürgen E. Fischer <[email protected]> Fri, 23 Oct 2015 14:10:38 +0200

qgis (2.10.0) unstable; urgency=medium

Expand Down
Binary file modified images/splash/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ms-windows/Installer-Files/WelcomeFinishPage.bmp
Binary file not shown.

0 comments on commit cd9d645

Please sign in to comment.