Mercurial > pidgin.yaz
diff doc/gtkimhtml-signals.dox @ 21106:95684692f622
fix up bad merge the bad way
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 25 Oct 2007 08:32:44 +0000 |
parents | e0613cf8c493 |
children | ffb8cd9fb528 |
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 25 Oct 2007 08:32:44 +0000 |
parents | e0613cf8c493 |
children | ffb8cd9fb528 |