Merge branch 'develop' of github.com:mapmapteam/mapmap into develop

Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = "MapMap"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = "0.2.1"
+PROJECT_NUMBER         = "0.3.1"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

MM.cpp

@@ -20,7 +20,7 @@
 #include "MM.h"
 
 const QString MM::APPLICATION_NAME = "MapMap";
-const QString MM::VERSION = "0.2.1";
+const QString MM::VERSION = "0.3.1";
 const QString MM::COPYRIGHT_OWNERS = "Sofian Audry, Alexandre Quessy, Mike Latona, Vasilis Liaskovitis, Dame Diongue";
 const QString MM::ORGANIZATION_NAME = "MapMap";
 const QString MM::ORGANIZATION_DOMAIN = "mapmap.info";

NEWS

@@ -1,9 +1,12 @@
 Release notes for MapMap
 ========================
 
-2015-??-?? - MapMap 0.2.1
+2015-07-17 - MapMap 0.3.0
 -------------------------
-* ?
+* Add zoom and scroll 
+* Use native color dialog 
+* Select mapping when a shape is clicked 
+* Fix perspective-correct textures
 
 2014-12-28 - MapMap 0.2.0
 -------------------------

VERSION.txt

@@ -1 +1 @@
-0.2.1
+0.3.1

mapmap.pro

@@ -1,6 +1,6 @@
 CONFIG  += qt debug
 TEMPLATE = app
-VERSION = 0.2.1
+VERSION = 0.3.1
 TARGET = mapmap
 QT += gui opengl xml
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets