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

diff --cc CONTRIBUTORS
index 664e339d3ae518ce7bdd2c35e1472d1a407d2a09,49833edba75137744e6f6af880cef4b66eeb258a..cee478de418125aa90127ecc4f5c0c1dd6dc0c75
--- 1/CONTRIBUTORS
--- 2/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@@ -1,18 -1,6 +1,17 @@@
- GtkRadiant CONTRIBUTORS and CREDITS
- last update: 28/02/2007
- =======================
+ GtkRadiant past contributors and credits
+ last update: 01/15/2001
 -=======================
 +
 +GtkRadiant 1.5 development:
 +-------
 +Thomas "namespace" Nitschke spam@codecreator.net
 +Stefan "Shaderman" Greven
 +"Topsun"
 +SmallPileofGibs spog@planetquake.com
 +"Tr3b"
 +
 +Small contributions and improvements for 1.5
 +--------
 +Eric "eb" Barth
  
  Loki
  ----

diff --cc tools/quake3/q3map2/main.c
index 5ad776d143586756293f79ed2b5f7d7b12264e33,045c1c62a44d96fdddf55b3dd90dd6ca4cdb5139..ba8583666f4e456a15962f3603bc7d7e694c375d
--- 1/tools/quake3/q3map2/main.c
--- 2/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@@ -1574,7 -503,7 +1574,7 @@@ int ConvertBSPMain( int argc, char **ar
        /* arg checking */
        if( argc < 1 )
        {
-               Sys_Printf( "Usage: q3map -convert -format <ase|obj|map_bp|map> [-shadesasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] <mapname>\n" );
 -              Sys_Printf( "Usage: q3map -convert [-format <ase|map>] [-v] <mapname>\n" );
++              Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
                return 0;
        }