Merge branch 'git-describe'
commit835e036515eade292b87cf4f127f3bf95707c530
authorSven Strickroth <email@cs-ware.de>
Fri, 17 Oct 2014 17:09:07 +0000 (17 19:09 +0200)
committerSven Strickroth <email@cs-ware.de>
Fri, 17 Oct 2014 17:09:07 +0000 (17 19:09 +0200)
tree1cebb88c5002cfc982d0fe4f75fe25a8801848de
parent1b2042f3cb8d9c0470a8789d72b2f5843bd838b5
parent958f1b7f4131945f776bffefaed967fb3855f75e
Merge branch 'git-describe'

(fixes issue #1316)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt