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/textures/flamer_ye/flameball.jpg | |
| parent | bd6fc418d171378de5de2b7450e22f70b4899b5c (diff) | |
| parent | 5130cdd357c5b3b442d39ee05052739419456e77 (diff) | |
Merge branch 'newguns'
Conflicts:
src/cgame/cg_local.h
src/cgame/cg_main.c
Diffstat (limited to 'assets/textures/flamer_ye/flameball.jpg')
0 files changed, 0 insertions, 0 deletions