changeset 17179:0598803f9b64

merge of '34ad536ba137d9ad9af8f55629835e501c9ba5f4' and 'b917cc2cf9c46c7163ad3345b312dac1eea896cf'
author Eric Polino <aluink@pidgin.im>
date Mon, 21 May 2007 14:42:45 +0000
parents c5ca1d9b67fa (diff) ddf759c28d0b (current diff)
children 923051464e88 618a3748ff64 da2bab3b9fab
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.mtn-ignore	Sun May 20 18:32:40 2007 +0000
+++ b/.mtn-ignore	Mon May 21 14:42:45 2007 +0000
@@ -66,3 +66,4 @@
 stamp-h1
 win32-install-dir(\.release)?
 VERSION$
+\.hg.*