Merge branch 'release-0.6.5'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Mon, 25 Feb 2013 19:08:20 +0000 (20:08 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Mon, 25 Feb 2013 19:08:20 +0000 (20:08 +0100)
commit115a06b805577bb1fff795363a2d19204bc7c3db
treec566aca3ebfa806a53aa528af3f7a116963d4781
parent6e31df2d8c37330519fd77632e8aa92cee1255da
parent4586eb2b9305a92ad4efbdd81180d09aca416b10
Merge branch 'release-0.6.5'

# By Henning Rogge (2) and others
# Via Henning Rogge
* release-0.6.5:
  Update version after release of v0.6.5.2
  Release v0.6.5.2
  olsrd-quagga: Fix memory leak when adding and deleting routes
  main: fix the check on inet_pton return value because it returns 1 on success.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
gui/win32/Main/Frontend.rc