Merge branch 'release-0.6.4'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 24 Apr 2013 09:06:13 +0000 (11:06 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 24 Apr 2013 09:06:13 +0000 (11:06 +0200)
commit0163cdaa849f93fc4f9b9bdd900eab1e16002f95
tree31201ca34066e803ed8bcdc0e08aaedb004fa1c2
parent079d92bfdb34631c351435357476cfe5271ba314
parentba45a9507c1b05324789017e1d393ae36e90ea23
Merge branch 'release-0.6.4'

* release-0.6.4:
  release: also check against the Makefile version when branching
  release: checkVersionIncrementing: optionally allow equal versions
  release: only report that master changed when it was actually changed
  release: do not update the version on master when it's already higher
  release: refactor the checkVersionIncrementing function
  release: update some comments
  release: fix the list of generated files
  build: ignore builddata.c when hashing sources
  Remove mercurial ignore file; we use git
  release: use olsrd-version prefix for files in the tarballs
  Fix multicast join for IPv6