push for merge

2016-04-21 09:02:18 +02:00
parent 033466111a
commit b6532dbe7f
5 changed files with 54 additions and 53 deletions
--- a/code/CMakeLists.txt.user
+++ b/code/CMakeLists.txt.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.6.0, 2016-04-14T12:59:26. -->
+<!-- Written by QtCreator 3.6.0, 2016-04-20T09:34:12. -->
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>