Rudolf Polzer 7fc621fc78 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

2012-05-07 12:32:31 +02:00

..

aselib.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

aselib.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

bspfile.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

bspfile.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

cmdlib.c

Merge remote-tracking branch 'ttimo/master'

2012-05-07 12:32:31 +02:00

cmdlib.h

Merge remote-tracking branch 'ttimo/master'

2012-05-07 12:32:31 +02:00

imagelib.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

imagelib.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

inout.c

fix invalid use of <glib/...> headers

2012-04-09 09:44:35 +02:00

inout.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

jpeg.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

l3dslib.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

l3dslib.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

md4.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

md4.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

mutex.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

mutex.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

polylib.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

polylib.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

polyset.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

qfiles.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

qthreads.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

scriplib.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

scriplib.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

surfaceflags.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

threads.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

trilib.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

trilib.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

unzip.c

Merge remote-tracking branch 'ttimo/master'

2012-05-07 12:32:31 +02:00

unzip.h

my own uncrustify run

2012-03-27 12:03:21 +02:00

vfs.c

my own uncrustify run

2012-03-27 12:03:21 +02:00

vfs.h

my own uncrustify run

2012-03-27 12:03:21 +02:00