projects / profile / tv / apps / native / homescreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 82b77b9 62115e9)
Merge branch 'tizen' of ssh://review.tizen.org:29418/profile/tv/apps/native/homescree... 56/37456/1
authorKim Youngjin <yj21c.kim@samsung.com>
Fri, 27 Mar 2015 01:49:03 +0000 (10:49 +0900)
committerKim Youngjin <yj21c.kim@samsung.com>
Fri, 27 Mar 2015 01:49:03 +0000 (10:49 +0900)
commit4bb84cfd7c0532fce74e27d50c4e04dc15bb9179
tree4136747c668b89e71cf529c39db6b1d3f2a486b1tree | snapshot
parent82b77b96bb020f9e73f4df7013d914c2f0d08e49commit | diff
parent62115e98d178ca2e6c6256b773ee2408e9193db7commit | diff
Merge branch 'tizen' of ssh://review.tizen.org:29418/profile/tv/apps/native/homescreen into tizen

Signed-off-by: Kim Youngjin <yj21c.kim@samsung.com>
Conflicts:
CMakeLists.txt
src/Bus.h
src/engine.cpp

Change-Id: Ieb35ebfc916461c2799c8f05325afb48c58ec68c
CMakeLists.txt diff1 | diff2 | blob | history
src/Bus.cpp diff1 | diff2 | blob | history
src/Bus.h diff1 | diff2 | blob | history
src/engine.cpp diff1 | diff2 | blob | history
Domain: Applications / Uncategorized;