Merge commit 'origin/async-texture-thread-pool' into async-size
authorØyvind Kolås <pippin@linux.intel.com>
Thu, 12 Mar 2009 11:18:11 +0000 (11:18 +0000)
committerØyvind Kolås <pippin@linux.intel.com>
Thu, 12 Mar 2009 11:18:11 +0000 (11:18 +0000)
commit25d54a650de130c463d562f07de8b5083e2e8495
tree4acd96ed2402073f352b0ccfd86559c68fecb1d0
parentc418b23baf635b9d94cdc50f62dc4380e0f5e41c
parent93d8f62f6bf9ade7e3049d8c30b5a1e38bf17561
Merge commit 'origin/async-texture-thread-pool' into async-size
clutter/clutter-texture.c