Merge commit 'git-svn' into multiple-texture-rectangle
authorNeil Roberts <neil@linux.intel.com>
Wed, 10 Dec 2008 12:25:25 +0000 (12:25 +0000)
committerNeil Roberts <neil@linux.intel.com>
Wed, 10 Dec 2008 12:25:25 +0000 (12:25 +0000)
commite21fee39b450beee1a140a3b075321687e9c6f05
tree2b9aa5f104e40ad36a2e00d782da12eb2f3bd803
parent9537f8e4ae69af43848f679d6568e94eb800b266
parentdc6545ccd1dcf63ae9981b4c2171eb74d704183f
Merge commit 'git-svn' into multiple-texture-rectangle
clutter/cogl/gl/cogl-context.h