Merge branch 'reduce-cpu'
authorMiriam Ruiz <miriam@debian.org>
Sun, 30 Nov 2008 18:47:25 +0000 (30 19:47 +0100)
committerMiriam Ruiz <miriam@debian.org>
Sun, 30 Nov 2008 18:47:25 +0000 (30 19:47 +0100)
1  2 
gfx.cpp

diff --cc gfx.cpp
Simple merge