Merge branch 'master' into blub/bc3
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:46:59 +0000 (11:46 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:46:59 +0000 (11:46 +0200)
1  2 
ir.c

diff --cc ir.c
Simple merge