Mercurial > pidgin
diff INSTALL @ 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 | f46ae7e62d13 |
children | 5ab7766a6c83 |
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 25 Oct 2007 08:32:44 +0000 |
parents | f46ae7e62d13 |
children | 5ab7766a6c83 |