Mercurial > pidgin
diff finch/gntmedia.c @ 26767:47d03538ee3f
Fix a bad merge (*sigh*)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 4f2f5659aa0d |
children | 2cd9560f9795 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 4f2f5659aa0d |
children | 2cd9560f9795 |