Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3

Browse Source

...

This commit is contained in:

ulteq 2015-04-21 15:47:01 +02:00

parent c27f3fb131 8a55c282e1

commit f69b86d02b

3 changed files with 846 additions and 844 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

extras/assets/icons

Icons_Modules.psd

png/Icon_Module

Icon_Module_Repair_ca.png

tools

make.py

BIN

extras/assets/icons/Icons_Modules.psd

Binary file not shown.

BIN

extras/assets/icons/png/Icon_Module/Icon_Module_Repair_ca.png Normal file

Binary file not shown.

Side by Side After (image error) Size: 1.6 KiB

1690

tools/make.py

File diff suppressed because it is too large Load Diff