]> git.rm.cloudns.org Git - xonotic/netradiant.git/commit
Merge remote-tracking branch 'origin/divVerent/speedup-patch' into divVerent/speedup... divVerent/speedup-patch
authorRudolf Polzer <divverent@xonotic.org>
Tue, 15 May 2012 10:03:08 +0000 (12:03 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 15 May 2012 10:03:08 +0000 (12:03 +0200)
commit244d8cc9222ba45435b14ca2fe70fd2a36f48775
treee06a466ea950a2a58013514b9f22373bf4a630fe
parentdac8329952745dbb494bad1c301e44bab05ec0db
parent3b0c5d8f3870412b045f9cfe0a22f18b493359e1
Merge remote-tracking branch 'origin/divVerent/speedup-patch' into divVerent/speedup-patch

Conflicts:
libs/mathlib.h
libs/mathlib/mathlib.c
tools/quake3/q3map2/light.c
tools/quake3/q3map2/light_trace.c
libs/mathlib.h
libs/mathlib/mathlib.c
tools/quake3/q3map2/light.c
tools/quake3/q3map2/light_trace.c