Merge branch 'modular' into multiple-inheritance
commitc6defd95789eed9ab6b4a8f861a7e1d49293a586
authorMauro Iazzi <mauro.iazzi@gmail.com>
Fri, 18 Jul 2008 15:01:32 +0000 (18 17:01 +0200)
committerMauro Iazzi <mauro.iazzi@gmail.com>
Fri, 18 Jul 2008 15:01:32 +0000 (18 17:01 +0200)
tree4701319152b5adf448e880c932525ea38a2aa918
parent1e8d19fc3fc5199417834df6c720962d2a9b3b37
parent67b6685c60d8d44529b9a1c286b7efac4b20c340
Merge branch 'modular' into multiple-inheritance