Merge branch 'tizen_2.2' into tizen
authorAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 07:26:44 +0000 (03:26 -0400)
committerAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 07:26:44 +0000 (03:26 -0400)
commite2f82f92999f2bcc68851dc2a8e172160983cf11
treef1798d2c5a337832def535154317f781727068b2
parent33333322677bf3a9cd6e62ed502119a3a9ace3cb
parentc1709ded678b4625babd4b905f7c2c733e92cc50
Merge branch 'tizen_2.2' into tizen

Change-Id: I6d566da781b0eb5102f478e58d6432490668017e
CMakeLists.txt
packaging/osp-image.spec