_farplanedist now ignores C_SKY leafs
simplify map file
fix invalid use of <glib/...> headers
Merge branch 'master' of /var/cache/git/xonotic/netradiant
Merge remote-tracking branch 'ttimo/master'

Conflicts:
	plugins/imagepng/plugin.cpp
	radiant/gtkdlgs.cpp
	radiant/radiant.ico
	tools/quake3/q3map2/image.c
oops, this was broken
use http for netradiant gamepack download
Merge remote-tracking branch 'ttimo/master'

Conflicts:
	config.py
	libs/missing.h
	plugins/model/cpicosurface.cpp
	plugins/vfspk3/unzip.cpp
	radiant/main.cpp
	radiant/mainframe.cpp
	radiant/mainframe.h
	radiant/missing.cpp
	radiant/pluginmanager.cpp
	radiant/preferences.cpp
	radiant/preferences.h
	tools/quake3/common/cmdlib.c
	tools/quake3/common/unzip.c
	tools/quake3/q3map2/image.c
Merge branch 'master' into divVerent/farplanedist-sky-fix

Conflicts:
	tools/quake3/q3map2/prtfile.c
	tools/quake3/q3map2/vis.c
	tools/quake3/q3map2/visflow.c
fix Q1pack URL
l_net: don't segfault of gethostbyname(gethostname()) fails

Can happen on Linux with misconfigured /etc/hosts.
fix compile error
made prefs restart radiant popup centered with fancy icon
Fix bug #1356: .obj loading bug in picolib

There's a bug in picolib when parsing the first group in an .obj file.

The library tries to set the surface name to a surface pointer
that is still NULL.

This gets silently ignored but the problem reappears later
in a warning message when the material or a face is parsed.
changed title of save dialog to make more sense
changed scaling restriction button tooltips to reflect what they're
actually doing
Merge pull request #135 from freemancw/master

Dialog/Tooltip Fixes
changed splash screen, swapped from bmp toolbar icons to png
changed bmps to pngs
updated splash image