merge with dev

2018-03-18 14:58:31 +01:00
parent 98d3f8de0a c73844d722
commit 0bf7736f61
13 changed files with 136 additions and 20 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Common source files for both CLI and non-CLI execautables
 set(CLISOURCEFILES
+    alignedmalloc.cc
    edit.cc
    main-cli.cc
    multilangmgr.cc
@@ -11,6 +12,7 @@ set(CLISOURCEFILES

 set(NONCLISOURCEFILES
    adjuster.cc
+    alignedmalloc.cc
    batchqueue.cc
    batchqueuebuttonset.cc
    batchqueueentry.cc