diff .hgrc @ 80:413945f4c18b

again, not sure why i need to commit after a actionless merge
author Jeff Hammel <jhammel@mozilla.com>
date Mon, 21 Jun 2010 13:17:31 -0700
parents 3c1f9b412675
children c4126b9a185f
line wrap: on
line diff