Merge commit 'git-svn' into multiple-texture-rectangle
authorNeil Roberts <neil@linux.intel.com>
Tue, 9 Dec 2008 15:10:56 +0000 (15:10 +0000)
committerNeil Roberts <neil@linux.intel.com>
Tue, 9 Dec 2008 15:10:56 +0000 (15:10 +0000)
commit2c9a79651a0d8b0400589b9e1232c941b09ebb2a
treec4d13e9a15dfdf3613e8b20d725772b943d2b284
parent0bedd891fb716e03b867e1f450205a2d503721cf
parente3dd18dc0c0a21847fe903da869fbbb61dc2fdfd
Merge commit 'git-svn' into multiple-texture-rectangle