Merge branch 'gui'
authorMilian Wolff <mail@milianw.de>
Mon, 15 Jun 2015 20:28:21 +0000 (22:28 +0200)
committerMilian Wolff <mail@milianw.de>
Mon, 15 Jun 2015 20:28:21 +0000 (22:28 +0200)
commitfdad5a7a1eb3da13d88087a0a2d6c2e6569c516d
tree11b63c192130cf134890e27024a495b89c1829ad
parent1045bbe9b21801c69a28ace14fc43613e7d24bd0
parentab8b0aa3a48267f2c34b1f5fe8e6569515bf9969
Merge branch 'gui'
CMakeLists.txt