Commit graph

6 commits

Author SHA1 Message Date
Enno Rehling
6fed596c36 Merge branch 'develop' into kill-seen-region 2016-09-16 17:12:40 +02:00
Enno Rehling
1dac556d09 Fix MSVC compilation (always include platform-specific hacks). 2016-09-16 17:11:33 +02:00
Enno Rehling
ad4377c0e7 Merge branch 'develop' into kill-seen-region
Conflicts:
	src/kernel/version.c
	src/kernel/version.h
2016-09-16 17:08:03 +02:00
Enno Rehling
55df24ffb8 all code review nitpicks fixed. 2016-09-16 16:54:41 +02:00
Enno Rehling
318cf68e1b move version string into a single object file 2016-09-16 16:30:17 +02:00
Enno Rehling
d8d3cd4cc4 move version string into a single object file 2016-09-15 20:11:38 +02:00