Trivial change to test merging

mdboom · mdboom · commit b57a110f5f7a · 2008-12-12T12:57:47.000Z
svn path=/branches/v0_98_5_maint/; revision=6581
diff --git a/TODO b/TODO
@@ -1,3 +1,5 @@
+-- Test merging from multiple branches.
+
 -- ALMOST DONE : add print/save functionality.  Currently you can save by right
    clicking on the fig window, but you must have nothing in front of
    the window.  I suppose I need to first draw to a pixbuf.  I would
@@ -739,4 +741,4 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- support zoom to rect in x or y only
 
--- add Ryan's patch
+-- add Ryan's patch
