Merge branch 'master' into cogl-float
authorRobert Bragg <robert@linux.intel.com>
Thu, 8 Jan 2009 11:48:00 +0000 (11:48 +0000)
committerRobert Bragg <robert@linux.intel.com>
Thu, 8 Jan 2009 11:48:00 +0000 (11:48 +0000)
commit378ca42d5b22355d39faf09fb16721f7a6ffbf94
treef40fb4da17690ee1dcd174280bcb05ce15a7b717
parentc1866858dd43c550f95da0840b9fb4225c12f3cc
parente4b1859077797049918d97d9ba1ec7b0c3cac0b8
Merge branch 'master' into cogl-float