Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 19 Dec 2009 20:30:52 +0000 (21:30 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 19 Dec 2009 20:30:52 +0000 (21:30 +0100)
1  2 
cmd.c
cvar.c
cvar.h

diff --cc cmd.c
Simple merge
diff --cc cvar.c
Simple merge
diff --cc cvar.h
Simple merge