Resolved conflicts
authorAndreas Schösser <andi@ipd.info.uni-karlsruhe.de>
Thu, 22 Mar 2007 13:35:08 +0000 (13:35 +0000)
committerAndreas Schösser <andi@ipd.info.uni-karlsruhe.de>
Thu, 22 Mar 2007 13:35:08 +0000 (13:35 +0000)
commit6c8a51b4609d4d2b2357aadae39689767894eb4a
tree3c304c050588196473a2a2a6fe2891e2fc84f930
parentd9ba33a4b9e7b4ee41bae2d4697c217cb4ad9b53
Resolved conflicts
ir/be/ia32/ia32_spec.pl