Merge branch 'tg/shapes-mode'
commit6fd6c4013f361c0e2e4653d222a3cd65c40a00f0
authorHenrik Tidefelt <tidde@59-50.isylogon.isy.liu.se>
Wed, 2 Jun 2010 10:45:50 +0000 (2 12:45 +0200)
committerHenrik Tidefelt <tidde@59-50.isylogon.isy.liu.se>
Wed, 2 Jun 2010 10:45:50 +0000 (2 12:45 +0200)
tree68ca867cd6bc4acf63ce88d9085d2a126280021d
parent55eb40eddb422045a9336617faa6f6cbf6711258
parentc4422f0c46d9c6e7aedb64d93d0bd6526d20e98e
Merge branch 'tg/shapes-mode'