Merge branch 'release-0.6.5'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 24 Apr 2013 09:06:25 +0000 (11:06 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 24 Apr 2013 09:06:25 +0000 (11:06 +0200)
commit4d1f44a2b154b691be6412b735e50ef6fec5bebb
tree31201ca34066e803ed8bcdc0e08aaedb004fa1c2
parent0163cdaa849f93fc4f9b9bdd900eab1e16002f95
parent3292d11688a2d691541d320a7b2ff08ad394207c
Merge branch 'release-0.6.5'

* release-0.6.5:
  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