Merge branch 'master' into 2.1_pypi_integration

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

Conflicts:
	.gitignore
	build
This commit is contained in:
Nico Schottelius 2012-10-25 22:35:20 +02:00
commit 5d319027d0
7 changed files with 55 additions and 14 deletions

View file

@ -0,0 +1,4 @@
x store version in .version
x when distributed / packaged, include .version into sourcecode
split into two files
x when in git checkout, use dynamic versioning