Merge branch 'tizen' into devel
authorOssama Othman <ossama.othman@intel.com>
Wed, 9 Oct 2013 17:45:05 +0000 (10:45 -0700)
committerOssama Othman <ossama.othman@intel.com>
Wed, 9 Oct 2013 17:45:05 +0000 (10:45 -0700)
1  2 
lib/manager.cpp

diff --cc lib/manager.cpp
Simple merge