Mercurial > pidgin
diff Makefile.am @ 26767:47d03538ee3f
Fix a bad merge (*sigh*)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 4b8c4870b13a |
children | cc8f641d2fde |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 4b8c4870b13a |
children | cc8f641d2fde |