Merge branch 'modular' into multiple-inheritance
commit9fe640955cddd8ea8a4a3c6403a559cdb383dfa9
authorMauro Iazzi <mauro.iazzi@gmail.com>
Tue, 15 Jul 2008 22:38:50 +0000 (16 00:38 +0200)
committerMauro Iazzi <mauro.iazzi@gmail.com>
Tue, 15 Jul 2008 22:38:50 +0000 (16 00:38 +0200)
tree5876d3d00b770883a057c791310830aa0ca63bec
parent3c387cb977e5b736481bd9aa6c42661be32dbf22
parentbcbed0c3c34b69394ecd2a900f612da7c98fe0cd
Merge branch 'modular' into multiple-inheritance