Code

Merging in from trunk
authorTed Gould <ted@gould.cx>
Sun, 29 Nov 2009 19:01:07 +0000 (13:01 -0600)
committerTed Gould <ted@gould.cx>
Sun, 29 Nov 2009 19:01:07 +0000 (13:01 -0600)
commit45660a4d22b900c4e70963313065f2f9bf57c9f7
tree727afe596c693a9bdd098d72618abd9ceb0d1969
parente9f05dd6fec63df99d79fefc7d5d5d655a654a99
parentf9f6f4fada64bcb29eddb5e0e8049f2336e01e8a
Merging in from trunk
configure.ac
src/Makefile.am
src/display/sp-canvas.cpp
src/file.cpp