Adding consolidated build files after merge 68/27868/1
authorRamasamy <ram.kannan@samsung.com>
Mon, 22 Sep 2014 06:34:23 +0000 (12:04 +0530)
committerRamasamy <ram.kannan@samsung.com>
Mon, 22 Sep 2014 06:34:33 +0000 (12:04 +0530)
commited9613e7a7d9df8e9b25fa7f59ab4f68565ba56e
tree66f925291f70ed34ad7391a4ad820dac571ccdab
parent6057615caaa47507f1541c8cdd0eca95d3803d55
Adding consolidated build files after merge

Merged the packaging/sensord.spec and src/CMakelists.txt from all
contributors and submitting. These files were causing conflicts
during merge.

Change-Id: I5ba565111efc112ae3571f9d0ffd7912afde5891
packaging/sensord.spec
src/CMakeLists.txt