images/mini-error.png
author Dan
Fri, 26 Oct 2007 19:28:54 -0400
changeset 204 473cc747022a
parent 33 143d3ee32f3c
child 1225 4c6da61e613e
permissions -rw-r--r--
You know what folks, a lot of Mercurial merges failed, and I just now figured out why. So now all changes from stable are permanently synced in.

(binary:image/png)