]> icculus.org git repositories - divverent/nexuiz.git/commit
projects / divverent / nexuiz.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8965344) | patch
fix svn mergefail
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 5 Sep 2009 20:02:49 +0000 (20:02 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 5 Sep 2009 20:02:49 +0000 (20:02 +0000)
commit80085cb2f8ea0405f01ac4306265809f588a24d9
tree16d4aa807147c6ee64ec1e60a98e0a263f33420btree
parent8965344459702d4aee1461ea2c6ba4a9aa201846commit | diff
fix svn mergefail

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@7652 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
data/maps/campaignnexuiz20.txt [new file with mode: 0644] blob
data/maps/campaignnexuiz25.txt [new file with mode: 0644] blob
data/models/ctf/shockwavetransring.md3.framegroups [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.