Merge pull request #58 from tribal-tec/master

Move vocabulary to new project Lexis
HBPVIS · May 23, 2016 · 11ddeff · 11ddeff
2 parents f64580a + 97baf0c
commit 11ddeff
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 629 deletions.
diff --git a/doc/Changelog.md b/doc/Changelog.md
@@ -2,14 +2,20 @@
 
 # git master
 
-* [48](https://github.com/HBPVIS/ZeroBuf/pull/48):
-  Fix notifyUpdated usage. Generate doxygen documentation
-* [49](https://github.com/HBPVIS/ZeroBuf/pull/49):
-  Added the exit event
+* [58](https://github.com/HBPVIS/ZeroBuf/pull/58):
+  Move vocabulary to new project Lexis  
+* [54](https://github.com/HBPVIS/ZeroBuf/pull/54):
+  Remove more string-related set/get from array/vector types
+* [53](https://github.com/HBPVIS/ZeroBuf/pull/53):
+  Remove set/getString method for non-string dynamic members
 * [52](https://github.com/HBPVIS/ZeroBuf/pull/52):
   Emit Qt signals plus their new values for PODs and strings in _fromBinary()
 * [51](https://github.com/HBPVIS/ZeroBuf/pull/51):
   Fix a bug in the Allocator with multiple reallocs
+* [49](https://github.com/HBPVIS/ZeroBuf/pull/49):
+  Added the exit event
+* [48](https://github.com/HBPVIS/ZeroBuf/pull/48):
+  Fix notifyUpdated usage. Generate doxygen documentation
 * [42](https://github.com/HBPVIS/ZeroBuf/pull/42):
   zerobufCxx.py can generate QObjects
 * [40](https://github.com/HBPVIS/ZeroBuf/pull/40):

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -17,6 +17,5 @@ set(TESTSCHEMA_OMIT_EXPORT ON)
 set(TESTSCHEMA_OMIT_INSTALL ON)
 common_library(testschema)
 
-set(TEST_LIBRARIES ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
-  ZeroBuf testschema ZeroBufRender ZeroBufData)
+set(TEST_LIBRARIES ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ZeroBuf testschema)
 include(CommonCTest)
diff --git a/tests/camera.cpp b/tests/camera.cpp
diff --git a/tests/data/progress.cpp b/tests/data/progress.cpp
diff --git a/tests/imageJPEG.cpp b/tests/imageJPEG.cpp