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)
commitee37d738ec913984051a2fd243435e260c0b6a75
treee503405f734026e0e9d7bf80333d803e0de8bca6
parentb4f9248363568e713d30cfa618e56e61b430a953
parent56f4f12b3f986f22a3ca88cb5497c8459df7dec7
Merge branch 'tizen' into devel
lib/manager.cpp