Mercurial > pidgin
diff finch/libgnt/gntentry.h @ 25244:300cf4e16720
Fix merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 02 Jan 2009 19:31:16 +0000 |
parents | 1f59065c606a |
children | 69decc147e5b |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 02 Jan 2009 19:31:16 +0000 |
parents | 1f59065c606a |
children | 69decc147e5b |