Merge branch 'tizen_2.2' into tizen
authorAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 04:40:38 +0000 (00:40 -0400)
committerAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 04:40:38 +0000 (00:40 -0400)
commit886bd366397333378b1e7c158eb4d45428e06df0
treee797b4df3e1017509e7cd5a9919630c1aecfd125
parentf1de5f80684d0b83752f703ffda09d03326b4366
parent6b2c5a85bb15cefdb373e71d3e5f5f25b8900b2d
Merge branch 'tizen_2.2' into tizen

Conflicts:
packaging/osp-uifw.spec

Change-Id: I12818775c4a286034a63bef20b5efabab281d1f4
CMakeLists.txt
packaging/osp-uifw.spec
src/uifw/CMakeLists.txt