diff options
| author | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
| commit | 7c02e34b08a4e44a7f7935bf6b1bee45c3a8df6c (patch) | |
| tree | e3ff69394522a6cc7dd11edf27cd69df6c0a5819 /assets/icons | |
| parent | bd6fc418d171378de5de2b7450e22f70b4899b5c (diff) | |
| parent | 5130cdd357c5b3b442d39ee05052739419456e77 (diff) | |
Merge branch 'newguns'
Conflicts:
src/cgame/cg_local.h
src/cgame/cg_main.c
Diffstat (limited to 'assets/icons')
| -rw-r--r-- | assets/icons/iconw_lightning.tga | bin | 0 -> 6814 bytes |
| -rw-r--r-- | assets/icons/iconw_smoke.tga | bin | 40044 -> 0 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/assets/icons/iconw_lightning.tga b/assets/icons/iconw_lightning.tga Binary files differnew file mode 100644 index 0000000..280e83d --- /dev/null +++ b/assets/icons/iconw_lightning.tga diff --git a/assets/icons/iconw_smoke.tga b/assets/icons/iconw_smoke.tga Binary files differdeleted file mode 100644 index 0dd72b1..0000000 --- a/assets/icons/iconw_smoke.tga +++ /dev/null |