Raptor007 / aq2-tng

Action Quake 2: The Next Generation. Raptor007's sandbox for testing changes. When verified stable, this code is pushed to the official aq2-tng repo:
https://github.com/aq2-tng/aq2-tng/tree/bots
4 stars 2 forks source link

Attempting to merge via GitHub to replace my manual merge. #2

Closed Raptor007 closed 8 years ago

Raptor007 commented 8 years ago

In commits 95ceab8 and d3d0ca1, I merged the latest 'master' branch by hand. Hopefully I can cleanly replace that effort with this proper merge.