Merge branch 'master' into feature/gnumake4
commit418a4edf9a13bb5ca376b057f7240ed76b2e2f8f
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>
Thu, 21 Jul 2011 16:38:59 +0000 (21 18:38 +0200)
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>
Thu, 21 Jul 2011 16:38:59 +0000 (21 18:38 +0200)
tree8d89620e96f73a3149c951670dd34f72040dcdaf
parent74bb009eaf645e029b790248f385f66eb1ce3233
parent4cae99bd81d4c64a292b5e59753916b67c9dc24c
Merge branch 'master' into feature/gnumake4
sd/CppunitTest_sd_uimpress.mk
sd/Library_sd.mk
sd/Library_sdfilt.mk
sd/Library_sdui.mk
slideshow/Library_OGLTrans.mk
slideshow/Library_slideshow.mk