Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 16 Sep 2009 20:10:35 +0000 (22:10 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 16 Sep 2009 20:10:35 +0000 (22:10 +0200)
1  2 
cmd.c
cvar.c

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