projects / platform / core / appfw / widget-viewer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f914020 3860bb7)
Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Sat, 24 Nov 2012 07:02:28 +0000 (16:02 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Sat, 24 Nov 2012 07:02:28 +0000 (16:02 +0900)
Conflicts:
CMakeLists.txt
packaging/liblivebox-viewer.spec

Change-Id: Ica4b083f7893640d71d7035914c903a9f98a324a


Trivial merge
Domain: App Framework / Widget;