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.1.2"
+PROJECT_NUMBER         = "0.2.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.1.2";
+const QString MM::VERSION = "0.2.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,10 +1,37 @@
 Release notes for MapMap
 ========================
 
-????-??-?? - MapMap 0.1.2
+2015-??-?? - MapMap 0.2.1
 -------------------------
 * ?
 
+2014-12-28 - MapMap 0.2.0
+-------------------------
+* Add --file option.
+* Add --osc-port option.
+* Add --reset-settings option.
+* Add crosshair cursor in fullscreen mode.
+* Add logo title in about dialog.
+* Can change OSC port via the new preference dialog.
+* Control mapping visibility from OSC (ticket #43)
+* File chooser now remembers last used directory.
+* Port to Qt5.
+* Recent files and videos menu items.
+* Select a shape with a click.
+* Select individual vertex and move it with the arrow keys.
+* Speed rate for playback.
+* Test signal image.
+* Videos plays by default at startup.
+* Fix: Add missing MM.h
+* Fix: Check for a valid OSC port number.
+* Fix: Fix fullscreen on GNOME
+* Fix: Fix main splitter proportions
+* Fix: Fix memory leak with the GStreamer pipeline manager.
+* Fix: Hide cursor in output window.
+* Fix: Press escape to toggle fullscreen.
+* Fix: Save fullscreen setting.
+* Fix: Save visibility of mappings.
+
 2014-07-07 - MapMap 0.1.1
 -------------------------
 * Fix packaging on OS X 10.9.3.

VERSION.txt

@@ -1 +1 @@
-0.1.2
+0.2.1

mapmap.pro

@@ -1,6 +1,6 @@
 CONFIG  += qt debug
 TEMPLATE = app
-VERSION = 0.1.2
+VERSION = 0.2.1
 TARGET = mapmap
 QT += gui opengl xml widgets
 DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB