Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into th_mmr
This commit is contained in:
commit
c6d1a1c6d7
1299 changed files with 47601 additions and 22302 deletions
|
|
@ -1,6 +1,6 @@
|
|||
normal_eng=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_en.png
|
||||
normal_thai=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_th.png
|
||||
press_eng=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_en.png
|
||||
press_thai=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_th.png
|
||||
disable_eng=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_en.png
|
||||
disable_thai=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_th.png
|
||||
normal_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
normal_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
press_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
press_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
disable_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
disable_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
BIN
image/event/strawberry_series/strawberry_series.mp4
Executable file
BIN
image/event/strawberry_series/strawberry_series.mp4
Executable file
Binary file not shown.
BIN
image/event/strawberry_series/strawberry_series.png
Normal file
BIN
image/event/strawberry_series/strawberry_series.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 345 KiB |
Loading…
Add table
Add a link
Reference in a new issue