Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 25 Nov 2007 02:00:15 +0000 (13:00 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 25 Nov 2007 02:00:15 +0000 (13:00 +1100)
commit2bd97ca9427bbb90c1ac81f8947d33dba4b86290
treee45cc99e45af12c4d05951a0ca17fc26ec634f68
parent2a2756a019ecdd5406ef84019610a0016868a39b
parent7043db677f457ae9a46f2585a5ef52bf69a4e8ea
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1