Mercurial > pidgin
diff COPYRIGHT @ 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 | 89c7be36fd61 |
children | 6de09629f091 |
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 25 Oct 2007 08:32:44 +0000 |
parents | 89c7be36fd61 |
children | 6de09629f091 |