Merge branch 'develop' of https://github.com/ErjanAltena/celix into develop
This closes #10 Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/fbd81b9d Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/fbd81b9d Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/fbd81b9d Branch: refs/heads/release/celix-2.0.0 Commit: fbd81b9d4093562b5fa23bb1d992daf6e9b997a6 Parents: 14ff729 7ab8b6b Author: Pepijn Noltes <pepijnnol...@gmail.com> Authored: Tue Oct 11 10:18:44 2016 +0200 Committer: Pepijn Noltes <pepijnnol...@gmail.com> Committed: Tue Oct 11 10:18:44 2016 +0200 ---------------------------------------------------------------------- cmake/cmake_celix/Packaging.cmake | 12 ++++++++++-- framework/public/include/properties.h | 6 ++---- 2 files changed, 12 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
