Rudolf Polzer 231225d6f9 Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a' ... Conflicts: .gitignore COMPILING CONTRIBUTORS ChangeLog DoxyConfig Doxyfile Doxygen_files/Doxyfile Doxygen_files/doxy_mainpage.h Doxygen_files/doxygen_gtkradiant_foot.html Doxygen_files/doxygen_gtkradiant_head.html Doxygen_files/doxygen_index.html Doxygen_files/doxygen_reference_foot.html Doxygen_files/doxygen_reference_head.html Doxygen_files/example/annotated.html Doxygen_files/example/classIEpair-members.html Doxygen_files/example/classIEpair.html Doxygen_files/example/classes.html Doxygen_files/example/files.html Doxygen_files/example/functions.html Doxygen_files/example/graph_legend.dot Doxygen_files/example/graph_legend.html Doxygen_files/example/index.html Doxygen_files/example/pages.html Doxygen_files/example/test_8c-source.html Doxygen_files/example/test_8c.html Doxygen_files/example/todo.html Doxygen_files/genDoxyfile Doxygen_files/gendoxfunctions Doxygen_files/reference1.html README.doxygen SConscript.q3map2 SConscript.radiant TODO config.py contrib/bkgrnd2d/bkgrnd2d.vcproj contrib/bobtoolz/bobtoolz.vcproj contrib/camera/camera.vcproj contrib/gtkgensurf/gtkgensurf.vcproj contrib/hydratoolz/hydratoolz.vcproj contrib/prtview/prtview.vcproj contrib/ufoai/ufoai.vcproj gen.readme gendox libs/picomodel/picomodules.c plugins/eclassfgd/fgd.vcproj plugins/entity/entity.vcproj plugins/image/image.vcproj plugins/imagem8/imagem8.vcproj plugins/imagepng/imagepng.vcproj plugins/imagewal/imagewal.vcproj plugins/map/map.vcproj plugins/mapxml/mapxml.vcproj plugins/model/model.vcproj plugins/shaders/shaders.vcproj plugins/spritemodel/spritemodel.vcproj plugins/surface/surface.vcproj plugins/surface_heretic2/surface_heretic2.vcproj plugins/surface_quake2/surface_quake2.vcproj plugins/surface_ufoai/surface_ufoai.vcproj plugins/textool/textool.vcproj plugins/vfspak/vfspak.vcproj plugins/vfspk3/vfspk3.vcproj plugins/vfswad/vfswad.vcproj radiant.sln radiant/main.cpp radiant/mainframe.cpp radiant/preferences.cpp radiant/preferences.h radiant/radiant.vcproj setup/data/tools/plugins/bt/bt-el2.txt tools/quake3/q3map2/main.c tools/quake3/q3map2/q3map2.vcproj windows_compile_guide/index.html		2012-03-27 11:43:50 +02:00
..
quake2	fix lots of CRLFs	2010-04-17 21:02:26 +02:00
quake3	Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a'	2012-03-27 11:43:50 +02:00