Merge with chun and jin
authorJin Yoon <jinny.yoon@samsung.com>
Mon, 10 Aug 2015 12:04:10 +0000 (21:04 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Mon, 10 Aug 2015 12:04:10 +0000 (21:04 +0900)
commit5c0a97167ce06660e193a3e339369599f064583d
tree068e1e5eab12d60ae36e7927331a22a816255dad
parent224250429252c346628cf23663b0a7abf7323614
Merge with chun and jin
60 files changed:
.cproject
.sdk_delta.info
.sign/.manifest.tmp
.sign/author-signature.xml
.sign/signature1.xml
chun/Makefile [deleted file]
chun/img/add_btn.png [deleted file]
chun/img/next_btn.png [deleted file]
chun/main.c [deleted file]
chun/main.edc [deleted file]
chun/main.o [deleted file]
chun/momentic [deleted file]
chun/momentic/Makefile [new file with mode: 0755]
chun/momentic/img/Daynight layer.png [new file with mode: 0755]
chun/momentic/img/add_btn.png [new file with mode: 0644]
chun/momentic/img/city0.png [moved from chun/img/floting_next_button.png with 63% similarity]
chun/momentic/img/city01.png [new file with mode: 0755]
chun/momentic/img/city1.png [new file with mode: 0755]
chun/momentic/img/city11.png [new file with mode: 0755]
chun/momentic/img/city2.png [new file with mode: 0755]
chun/momentic/img/city21.png [new file with mode: 0755]
chun/momentic/img/next_btn.png [new file with mode: 0755]
chun/momentic/img/orange small.png [new file with mode: 0755]
chun/momentic/img/orange.png [new file with mode: 0755]
chun/momentic/img/pink small.png [new file with mode: 0755]
chun/momentic/img/pink.png [new file with mode: 0755]
chun/momentic/img/searching list.png [moved from chun/img/searchlist.png with 100% similarity]
chun/momentic/img/searchlist.png [new file with mode: 0755]
chun/momentic/img/world_map.png [moved from chun/img/world_map.png with 100% similarity]
chun/momentic/main.c [new file with mode: 0755]
chun/momentic/main.o [new file with mode: 0644]
chun/momentic/map.c [new file with mode: 0755]
chun/momentic/map.h [new file with mode: 0755]
chun/momentic/map.o [new file with mode: 0644]
chun/momentic/momentic [new file with mode: 0755]
chun/momentic/momentic.edc [new file with mode: 0755]
chun/momentic/momentic.edj [moved from chun/main.edj with 58% similarity]
inc/city.h
inc/conf.h
inc/db.h
inc/group_info.h
inc/item.h
inc/main.h
inc/main_view.h
inc/map.h
inc/popup.h [new file with mode: 0644]
inc/scroller.h
inc/util.h
res/edje/conf.h [new file with mode: 0644]
res/edje/item.edc
res/edje/main_view.edc
res/edje/momentic.edc [new file with mode: 0644]
shared/res/adventure.png
src/db.c
src/group_info.c
src/item.c
src/main_view.c
src/map.c
src/popup.c [new file with mode: 0644]
src/scroller.c