Michael Schwarz d08e4be25f Merge branch 'master' into no-examples ... Conflicts: .gitignore		2014-12-25 15:16:42 +01:00
..
.gitignore	Added a .gitignore file to the src directory so it will be created when cloning the repository.	2014-12-21 14:16:02 +01:00