projects / apps / native / sample / adventure.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8cf9b79) | patch
Merge between chun and jin
authorJin Yoon <jinny.yoon@samsung.com>
Mon, 10 Aug 2015 11:29:34 +0000 (20:29 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Mon, 10 Aug 2015 11:29:34 +0000 (20:29 +0900)
commit224250429252c346628cf23663b0a7abf7323614
tree293b4c9940df5a27724193f361d4097da84b01b5tree | snapshot
parent8cf9b7971509d2dca027ba397f5be710203c9458commit | diff
Merge between chun and jin
29 files changed:
res/edje/images/searching_bar.png [deleted file] blob | history
res/edje/images/world_map.png [deleted file] blob | history
res/images/Aventure01.1.png [moved from res/edje/images/Aventure01.1.png with 100% similarity] blob | history
res/images/Aventure01.png [moved from res/edje/images/Aventure01.png with 100% similarity] blob | history
res/images/Aventure01_background.png [moved from res/edje/images/Aventure01_background.png with 100% similarity] blob | history
res/images/Day_nite_edit2.psd [new file with mode: 0755] blob
res/images/Daynight layer.png [new file with mode: 0755] blob
res/images/Location.gif [moved from res/edje/images/Location.gif with 100% similarity] blob | history
res/images/Moments_EB.psd [new file with mode: 0755] blob
res/images/add.png [moved from res/edje/images/delete_button.png with 58% similarity, mode: 0755] diff | blob | history
res/images/add_btn.png [new file with mode: 0644] blob
res/images/bg.jpg [moved from res/edje/images/bg.jpg with 100% similarity] blob | history
res/images/btn.png [moved from res/edje/images/btn.png with 100% similarity] blob | history
res/images/city0.png [moved from res/edje/images/my_status_small.png with 100% similarity] blob | history
res/images/city01.png [new file with mode: 0644] blob
res/images/city1.png [moved from res/edje/images/other_location_blue_small.png with 100% similarity] blob | history
res/images/city11.png [new file with mode: 0644] blob
res/images/city2.png [moved from res/edje/images/other_location_mint_small.png with 100% similarity] blob | history
res/images/city21.png [new file with mode: 0644] blob
res/images/next.png [new file with mode: 0755] blob
res/images/next2.png [new file with mode: 0755] blob
res/images/next_btn.png [new file with mode: 0644] blob
res/images/orange small.png [moved from res/edje/images/searching_X.png with 90% similarity, mode: 0755] diff | blob | history
res/images/orange.png [new file with mode: 0755] blob
res/images/pink small.png [new file with mode: 0755] blob
res/images/pink.png [new file with mode: 0755] blob
res/images/searching list.png [moved from res/edje/images/other_location_blue.png with 75% similarity] diff | blob | history
res/images/searchlist.png [new file with mode: 0644] blob
res/images/하단 버튼.png [moved from res/edje/images/other_location_mint.png with 81% similarity, mode: 0755] diff | blob | history
Domain: Applications / Uncategorized;