]> icculus.org git repositories - divverent/nexuiz.git/commit
projects / divverent / nexuiz.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 93ee5a6) | patch
fix some mess created during merging
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 31 Jan 2009 15:11:35 +0000 (15:11 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 31 Jan 2009 15:11:35 +0000 (15:11 +0000)
commit807cd319396d026c030da74c4772cef95390931d
tree06b3842425b1985df1a25e10a87ba46abee48ec5tree
parent93ee5a62c256fb49dd85b01094056ccebe65a232commit | diff
fix some mess created during merging

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@5709 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
41 files changed:
Docs/htmlfiles/basics.aft.merge-left.r0 [deleted file] blob | history
Docs/htmlfiles/basics.aft.merge-right.r5119 [deleted file] blob | history
Docs/htmlfiles/basics.aft.working [deleted file] blob | history
Docs/server/rcon.pl [deleted file] blob | history
Docs/server/rcon2irc/rbiserver.pl [deleted file] blob | history
Docs/server/rcon2irc/rcon2irc-example.conf [deleted file] blob | history
Docs/server/rcon2irc/rcon2irc.pl [deleted file] blob | history
Docs/server/rcon2irc/rcon2irc.txt [deleted file] blob | history
Docs/server/readme.txt [deleted file] blob | history
Docs/server/server.cfg [deleted file] blob | history
Docs/server/server_linux.sh [deleted file] blob | history
Docs/server/server_mac.sh [deleted file] blob | history
Docs/server/server_pro_linux.sh [deleted file] blob | history
Docs/server/server_pro_mac.sh [deleted file] blob | history
Docs/server/server_pro_windows.bat [deleted file] blob | history
Docs/server/server_windows.bat [deleted file] blob | history
data/defaultHavoc.cfg [new file with mode: 0644] blob
data/gfx/sb_key_carrying_outline.tga [deleted file] blob | history
data/maps/aggressor.map.options [new file with mode: 0644] blob
data/maps/bloodprison.map.options [new file with mode: 0644] blob
data/maps/bloodprisonctf.map.options [new file with mode: 0644] blob
data/maps/eggandbacon.bsp [new file with mode: 0644] blob
data/maps/eggandbacon.jpg [new file with mode: 0644] blob
data/maps/eggandbacon.map [new file with mode: 0644] blob
data/maps/eggandbacon.map.options [new file with mode: 0644] blob
data/maps/eggandbacon.mapinfo [new file with mode: 0644] blob
data/maps/eggandbacon.waypoints [new file with mode: 0644] blob
data/maps/final_rage.map.options [new file with mode: 0644] blob
data/maps/ons-reborn-terrain.pcx [new file with mode: 0644] blob
data/maps/ruiner.map.options [new file with mode: 0644] blob
data/maps/stormkeep.map.options [new file with mode: 0644] blob
data/models/grass02.md3 [new file with mode: 0644] blob
data/models/grass03.md3 [new file with mode: 0644] blob
data/models/mtree01.md3 [new file with mode: 0644] blob
data/models/mtree02.md3 [new file with mode: 0644] blob
data/models/mtree03.md3 [new file with mode: 0644] blob
data/physicsHavoc.cfg [new file with mode: 0644] blob
data/qcsrc/client/Main.qc diff | blob | history
data/qcsrc/server/cl_client.qc diff | blob | history
data/scripts/eggandbacon.shader [new file with mode: 0644] blob
data/weaponsHavoc.cfg [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.