projects / apps / native / widget / widget.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e6cb6e 5f3e53e)
Merge branch 'tizen_2.4' of ssh://spin:29418/apps/widget/widget into tizen accepted/tizen/mobile/20150530.065423 accepted/tizen/mobile/20150609.090349 submit/tizen_mobile/20150527.071719 submit/tizen_mobile/20150529.103212 submit/tizen_mobile/20150609.051219
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 13:16:53 +0000 (22:16 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 13:16:53 +0000 (22:16 +0900)
Conflicts:
src/snapshot_window.c

Change-Id: I6708a6664b69635011b243d6b244018fdcf79855

1  2 
src/virtual_window.c patch | diff1 | diff2 | blob | history

diff --cc src/virtual_window.c
Simple merge
Domain: Applications / Uncategorized;