Merge branch 'master' of git://repo.or.cz/gfxprim
commit2f824b15387739be5c32dd417b6fabbf54234bc8
authorBlueBear <jiri.bluebear.dluhos@gmail.com>
Sun, 11 Dec 2011 14:03:47 +0000 (11 15:03 +0100)
committerBlueBear <jiri.bluebear.dluhos@gmail.com>
Sun, 11 Dec 2011 14:03:47 +0000 (11 15:03 +0100)
treee19a85ff6f163f70bdc2306019167b6d6444cb2f
parent0c88946ef930d04eb2c3ea3afe202ab8248150b4
parent36a72a1ec467da8e2b49ed57e98be58f911d01f7
Merge branch 'master' of git://repo.or.cz/gfxprim