Merge branch 'release-0.9.0'

* release-0.9.0:
  Update version after release of v0.9.0.3
  Release v0.9.0.3
  Handle interface broadcast/multicast address zero

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>

diff --git a/CHANGELOG b/CHANGELOG
index 99641be..4820bc8 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -159,6 +159,20 @@ Sebastian Kürten (2):
 Teco Boot (1):
       arprefresh: README adjusted for plugin name
 
+0.6.8.1 -------------------------------------------------------------------
+
+Ferry Huberts (4):
+      pud: wireformat-java: improve java detection
+      release: stricter matching of release tags
+      autobuf: fix warning in Windows release builds
+      neighbors: signal link changes when deleting a neighbor
+
+Henning Rogge (4):
+      Update version after release of v0.6.8
+      tc: properly initialise the path_costs field in a new tc
+      Handle interface broadcast/multicast address zero
+      Release v0.6.8.1
+
 0.6.8 -------------------------------------------------------------------
 
 Ferry Huberts (81):

diff --git a/Makefile b/Makefile
index 49a8dca..4d8a7d8 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.9.0.4
+VERS =         pre-0.9.1
 
 TOPDIR = $(shell pwd)
 INSTALLOVERWRITE ?=

diff --git a/files/olsrd.conf.default.full.txt b/files/olsrd.conf.default.full.txt
index f5c1058..13ea5f5 100644 (file)
--- a/files/olsrd.conf.default.full.txt
+++ b/files/olsrd.conf.default.full.txt
@@ -46,7 +46,7 @@
 # The lockfile is used to prevent multiple OLSR instances running at the same
 # time.
 # (Linux/BSD default is "/var/run/olsrd-ipv(4/6).lock")
-# (Win32     default is "configfile-ipv(4/6).lock")
+# (Win32     default is "[configfile]-ipv(4/6).lock")
 
 # LockFile "/var/run/olsrd-ipv4.lock"
 

diff --git a/gui/win32/Inst/installer.nsi b/gui/win32/Inst/installer.nsi
index 6befd9e..fabc79c 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.9.0.4 on your computer. Continue?" IDYES NoAbort
+        MessageBox MB_YESNO "This will install olsr.org pre-0.9.1 on your computer. Continue?" IDYES NoAbort
         Abort
 NoAbort:
 FunctionEnd

diff --git a/gui/win32/Main/Frontend.rc b/gui/win32/Main/Frontend.rc
index 30bcbf6..9b216ac 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.9.0.4"
+CAPTION "olsr.org Switch pre-0.9.1"\r
 FONT 8, "MS Sans Serif", 0, 0, 0x1\r
 BEGIN\r
     CONTROL         "Tab1",IDC_TAB1,"SysTabControl32",0x0,7,7,383,256\r