projects / platform / core / appfw / vconf-internal-keys.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45f115e 430ec47)
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)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
packaging/vconf-internal-keys.spec patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc packaging/vconf-internal-keys.spec
Simple merge
Domain: System / Base;