Merge remote-tracking branch 'origin/masterpiece' into th_inter
This commit is contained in:
commit
7c084cd7c6
92 changed files with 70785 additions and 21165 deletions
|
|
@ -1,6 +1 @@
|
|||
normal_eng=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
|
||||
normal_thai=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
|
||||
press_eng=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
|
||||
press_thai=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
|
||||
disable_eng=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
|
||||
disable_thai=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
|
||||
normal_thai=ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png
|
||||
BIN
image/event/pepsi_x_taobin/pepsi_x_taobin.mp4
Executable file
BIN
image/event/pepsi_x_taobin/pepsi_x_taobin.mp4
Executable file
Binary file not shown.
BIN
image/event/pepsi_x_taobin/pepsi_x_taobin.png
Normal file
BIN
image/event/pepsi_x_taobin/pepsi_x_taobin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 533 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
Loading…
Add table
Add a link
Reference in a new issue