Merge branch 'horizontals'
authorMatthias Kramm <kramm@quiss.org>
Sun, 6 Jun 2010 00:18:41 +0000 (17:18 -0700)
committerMatthias Kramm <kramm@quiss.org>
Sun, 6 Jun 2010 00:18:41 +0000 (17:18 -0700)
commita9634f803811f39e67114955c3e9c30ae247a669
tree96f66b3187f2159aef343e3b67799f6637acde24
parent98370d6c69a85a6b148939956d8edfb324a0740a
parent70ce1703acd71940235f2db58840c21d2a697003
Merge branch 'horizontals'

Conflicts:
lib/gfxpoly/Makefile
lib/gfxpoly/poly.h
config.h.in
lib/gfxpoly/Makefile
wx/Makefile
wx/gui/dialogs.py