Merging tizen into ckm. Stage 2. 20/38320/1
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 16 Apr 2015 10:08:44 +0000 (12:08 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 16 Apr 2015 10:16:58 +0000 (12:16 +0200)
commit2cae7d239635c99bb67421a5b1b3f0e326c034fd
tree65a9ae65ce7257ba16ef18bb9fe649ee021cc2fa
parent6d370c9cedc0044f12e434de5669da4689156e64
parent7019d2b04887994ff0f87ab8020cc367ffe1994a
Merging tizen into ckm. Stage 2.

Merged commit '7019d2b04887994ff0f87ab8020cc367ffe1994a' into ckm

Change-Id: I80f23e4825da2bb7167d43863e6ed1331a5f5776
CMakeLists.txt
src/CMakeLists.txt
src/ckm/CMakeLists.txt