changeset 17178:c5ca1d9b67fa

merge of '745cf14dbfb86060ab8826900f365a2f0592747e' and 'a2283b64b34e89187d1eb3015219bafedbdfdae3'
author Eric Polino <aluink@pidgin.im>
date Fri, 18 May 2007 14:00:33 +0000
parents d761647bc7c4 (diff) 7f00fb7f18b5 (current diff)
children 0598803f9b64 d8b9bea550bc
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.mtn-ignore	Fri May 18 12:48:03 2007 +0000
+++ b/.mtn-ignore	Fri May 18 14:00:33 2007 +0000
@@ -66,3 +66,4 @@
 stamp-h1
 win32-install-dir(\.release)?
 VERSION$
+\.hg.*