summaryrefslogtreecommitdiff
path: root/misc/merge-ioq3-into-trem.sh
AgeCommit message (Collapse)Author
2017-02-06remove the (non-working) MSVC solution, a bunch of scripts from the source ↵/dev/humancontroller
tree, and cruft from the .gitignore
2013-02-16Add merge data to .gitignoreTim Angus
2013-02-16Make the merge script actually workTim Angus
2013-01-13Manual update to last merge SHATim Angus
2013-01-12Add git ioq3 merge scriptTim Angus
2007-09-05* Merge of ioq3-r1163Tim Angus
+ SDL everywhere + New R_LoadImage + net_ip.c + Window icon + GUI based dedicated server support + Compile time linked OpenGL * Remove ui_menuFiles cvar
2006-11-28* Merge ioq3-989Tim Angus
2006-01-10* Removed Q3 iconsTim Angus
* Removed ludwig's loki setup dir * Added Tremulous icons
2006-01-05* Merged ioq3-460Tim Angus
- avi exporter - cl_autoRecordDemo - .asm dependencies
2005-12-29* Merged ioq3-r451 into trunkTim Angus
2005-12-29* Added script to merge ioq3 into tremTim Angus