Merge branch 'master' of git://git.xonotic.org/xonotic/netradiant
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 15 May 2011 20:28:13 +0000 (22:28 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 15 May 2011 20:28:13 +0000 (22:28 +0200)
commit2ceb6c1c5a81cf13f14c52d276bb9b46bcf31f3b
tree6724f7a8b40dc62b7266298b8d439bb503d31714
parentf2ba0cbb0ae1c32d37c9eeacb7e91d195b6f6df4
parent32c2fd3b6229504f780d729bbd67dc88f42614b3
Merge branch 'master' of git://git.xonotic.org/xonotic/netradiant

Conflicts:
tools/quake3/q3map2/path_init.c