]> git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/model/model.cpp
Merge branch 'master' into divVerent/farplanedist-sky-fix
authorRudolf Polzer <divverent@xonotic.org>
Tue, 15 May 2012 09:56:17 +0000 (11:56 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 15 May 2012 09:58:06 +0000 (11:58 +0200)
commitdac8329952745dbb494bad1c301e44bab05ec0db
tree444e0ddb791d53ff43c170ecd72349cb53d4b569
parent34d45e210f74edf0690df413b45cc7630d91bd01
parent7fc621fc78d0e040dc2c12f38dc53dd9048215dc
Merge branch 'master' into divVerent/farplanedist-sky-fix

Conflicts:
tools/quake3/q3map2/prtfile.c
tools/quake3/q3map2/vis.c
tools/quake3/q3map2/visflow.c
tools/quake3/q3map2/prtfile.c
tools/quake3/q3map2/q3map2.h
tools/quake3/q3map2/vis.c
tools/quake3/q3map2/visflow.c