Metapyziks/MarsMiner — pull request #7 by Tamschi (2012-01-16 03:34:50+00:00)
Title: conflict file dropped and .hgignore

I dropped the MarsMinerWindow.cs.orig file from the license merge and copied the .gitignore into .hgignore, as hg-git doesn't translate this.