Merge branch 'tizen_2.2' into tizen
authorAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 18:29:12 +0000 (14:29 -0400)
committerAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 18:29:12 +0000 (14:29 -0400)
commitf0e7eeedc32051a324b028ac70e65b892a14b0fe
tree5b714f9e722751ae5d7b1759f47e0b534c52e234
parent45f115e7751627a153a73e3637b409c26601937a
parent430ec47127cd88b5eed0e713d648bce518089670
Merge branch 'tizen_2.2' into tizen
CMakeLists.txt
packaging/vconf-internal-keys.spec