Merge branch 'release-0.6.6'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 24 Apr 2013 09:06:28 +0000 (11:06 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 24 Apr 2013 09:06:28 +0000 (11:06 +0200)
commit277b22d61d843c1e883fd12b09b2db9faa1b60bb
tree31201ca34066e803ed8bcdc0e08aaedb004fa1c2
parent4d1f44a2b154b691be6412b735e50ef6fec5bebb
parent970d902c55bf452e381278ab8c314b95b77a3b69
Merge branch 'release-0.6.6'

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