de.git.xonotic.org Git - xonotic/netradiant.git/commit

]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - tools/quake3/q3data/q3data.h

projects / xonotic / netradiant.git / commit

author	Rudolf Polzer <divverent@alientrap.org>
	Tue, 27 Mar 2012 10:11:37 +0000 (12:11 +0200)
committer	Rudolf Polzer <divverent@alientrap.org>
	Tue, 27 Mar 2012 10:11:37 +0000 (12:11 +0200)
commit	b7e36c120eb1546a6c6f97f30e42ab7f9a559c61
tree	fd12a84d5e534bda621c620a0bb22787aed4df29	tree \| snapshot
parent	3c73487420fde8d4a3b5360d8b99e48132517900	commit \| diff
parent	686a211fc38285905245e537acf9d96e66b9675c	commit \| diff

Merge remote-tracking branch 'github/master'

Conflicts:
.gitignore
config.py
libs/synapse/synapse.cpp
plugins/imagehl/lbmlib.cpp
plugins/surface_heretic2/surfacedialog.cpp
plugins/surface_ufoai/surfacedialog.cpp
radiant/brushscript.cpp
radiant/main.cpp
radiant/preferences.cpp
tools/quake3/common/cmdlib.c
tools/quake3/common/cmdlib.h
tools/quake3/q3map2/path_init.c
windows_compile_guide/index.html

RSS Atom

contrib/bobtoolz/DBrush.cpp	diff1 \|	diff2 \|	blob \| history
libs/splines/splines.cpp	diff1 \|	diff2 \|	blob \| history
libs/splines/util_str.cpp	diff1 \|	diff2 \|	blob \| history
tools/quake3/common/cmdlib.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/common/cmdlib.h	diff1 \|	diff2 \|	blob \| history
tools/quake3/common/inout.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/main.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/path_init.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/q3map2.h	diff1 \|	diff2 \|	blob \| history