Merge branch 'master' into 2.1
authorJisung Ahn <jcastle.ahn@samsung.com>
Tue, 16 Apr 2013 07:50:53 +0000 (16:50 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Tue, 16 Apr 2013 07:50:53 +0000 (16:50 +0900)
commitec28a7b24920c3eb1adf79acf11a436d69e0055c
tree6a65b4595e2de0d863d51dfa60f841ebaca0ab67
parent135bf500a3b4a66a786a71c56016ed01b3cfa3ab
parent875b7295a63cf4ee22c8fd53f171b377abb2f198
Merge branch 'master' into 2.1

Conflicts:
CMakeLists.txt
include/sg-debug.h
include/sg-keys.h
include/ug-setting-gallery.h
packaging/ug-setting-gallery-efl.spec
src/sg-keys.c
src/ug-setting-gallery.c

Change-Id: I9758e63ca1962bcf4243e5b4ad28d39de7b858d1
include/sg-keys.h
src/ug-setting-gallery.c