review.tizen.org Git - framework/uifw/elementary.git/commit

author	ChunEon Park <chuneon.park@samsung.com>
	Fri, 9 Mar 2012 05:14:46 +0000 (14:14 +0900)
committer	ChunEon Park <chuneon.park@samsung.com>
	Fri, 9 Mar 2012 05:14:46 +0000 (14:14 +0900)
commit	9d446c30b60c3d6661b641aa6f04b4a8f3752c0d
tree	8ac86c7e34b0b08894f995d558e7be524ce5e709	tree \| snapshot
parent	dc51613aaddf690cb50f00eaa19b38874c6790ef	commit \| diff

3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout - removed conflicsts

27 files changed:

data/themes/widgets/index.edc		diff \| blob \| history
data/themes/widgets/naviframe.edc		diff \| blob \| history
doc/widgets/widget_preview_index.c		diff \| blob \| history
src/bin/test_3d.c		diff \| blob \| history
src/bin/test_gesture_layer2.c		diff \| blob \| history
src/bin/test_gesture_layer3.c		diff \| blob \| history
src/bin/test_glview.c		diff \| blob \| history
src/bin/test_glview_simple.c		diff \| blob \| history
src/bin/test_index.c		diff \| blob \| history
src/bin/test_naviframe.c		diff \| blob \| history
src/bin/test_transit.c		diff \| blob \| history
src/edje_externals/elm_index.c		diff \| blob \| history
src/examples/index_example_01.c		diff \| blob \| history
src/examples/index_example_02.c		diff \| blob \| history
src/lib/elc_fileselector.c		diff \| blob \| history
src/lib/elc_naviframe.c		diff \| blob \| history
src/lib/elc_naviframe.h		diff \| blob \| history
src/lib/elm_frame.c		diff \| blob \| history
src/lib/elm_frame.h		diff \| blob \| history
src/lib/elm_gesture_layer.c		diff \| blob \| history
src/lib/elm_gesture_layer.h		diff \| blob \| history
src/lib/elm_glview.c		diff \| blob \| history
src/lib/elm_glview.h		diff \| blob \| history
src/lib/elm_layout.c		diff \| blob \| history
src/lib/elm_layout.h		diff \| blob \| history
src/lib/elm_transit.c		diff \| blob \| history
src/lib/elm_transit.h		diff \| blob \| history

Domain: UI Framework / Uncategorized;