Release v0.6.5.5

Signed-off-by: Henning Rogge <hrogge@googlemail.com>

diff --git a/CHANGELOG b/CHANGELOG
index e1259f0..d1a5229 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+0.6.5.5 -------------------------------------------------------------------
+
+Ferry Huberts (4):
+      build: really _ignore_ builddata.c when hashing sources
+      build: only print the md5 hash in hash_source.sh
+      Makefile: fix builddata when building from tarball
+      pud: fix readIPAddress function
+
+Henning Rogge (3):
+      Update version after release of v0.6.5.4
+      Fix build break for MinGW compilation on Fedora 19.
+      Release v0.6.5.5
+
+Scott Kidder (1):
+      jsoninfo: ensure output is wrapped in curly braces.
+
 0.6.5.4 -------------------------------------------------------------------
 
 Ferry Huberts (11):

diff --git a/Makefile b/Makefile
index c6a219a..2e06a04 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@
 # Please also write a new version to:
 # gui/win32/Main/Frontend.rc (line 71, around "CAPTION [...]")
 # gui/win32/Inst/installer.nsi (line 57, around "MessageBox MB_YESNO [...]")
-VERS =         pre-0.6.5.5
+VERS =         0.6.5.5
 
 TOPDIR = .
 INSTALLOVERWRITE ?=

diff --git a/gui/win32/Inst/installer.nsi b/gui/win32/Inst/installer.nsi
index 039a8e9..0bca4d5 100644 (file)
--- a/gui/win32/Inst/installer.nsi
+++ b/gui/win32/Inst/installer.nsi
@@ -54,7 +54,7 @@ UninstPage uninstConfirm
 UninstPage instfiles
 
 Function .onInit
-        MessageBox MB_YESNO "This will install olsr.org pre-0.6.5.5 on your computer. Continue?" IDYES NoAbort
+        MessageBox MB_YESNO "This will install olsr.org 0.6.5.5 on your computer. Continue?" IDYES NoAbort
         Abort
 NoAbort:
 FunctionEnd

diff --git a/gui/win32/Main/Frontend.rc b/gui/win32/Main/Frontend.rc
index bc37e21..2a6ace5 100644 (file)
--- a/gui/win32/Main/Frontend.rc
+++ b/gui/win32/Main/Frontend.rc
@@ -68,7 +68,7 @@ IDD_FRONTEND_DIALOG DIALOGEX 0, 0, 399, 289
 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | \r
     WS_SYSMENU\r
 EXSTYLE WS_EX_APPWINDOW\r
-CAPTION "olsr.org Switch pre-0.6.5.5"
+CAPTION "olsr.org Switch 0.6.5.5"
 FONT 8, "MS Sans Serif", 0, 0, 0x1\r
 BEGIN\r
     CONTROL         "Tab1",IDC_TAB1,"SysTabControl32",0x0,7,7,383,256\r