| Fri, 28 Sep 2007 21:49:48 +0000 |
Daniel Atallah |
propagate from branch 'im.pidgin.pidgin.2.2.1' (head e7d234a12dbb89fdfd195e4597018a80f2c541f5)
|
| Fri, 28 Sep 2007 20:58:48 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 179c071e5cda5fe178066a9251e7b473ee8b0b10)
|
| Fri, 28 Sep 2007 20:34:50 +0000 |
Richard Laager |
I don't know what MTN was smoking during that last merge.
|
| Fri, 28 Sep 2007 20:34:07 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin.2.2.1' (head b6dd1235937803f38d887d797ea99bb836159cc6)
|
| Fri, 28 Sep 2007 20:32:15 +0000 |
Richard Laager |
I hate merging po files.
|
| Fri, 28 Sep 2007 20:30:26 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 0a3d37418d9f633be9e197c09bf5b61d32dc5585)
|
| Fri, 28 Sep 2007 20:29:06 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head e76d28a0d9305478af3a13c36b2feaa466fc27ec)
|
| Fri, 28 Sep 2007 19:29:50 +0000 |
Richard Laager |
merge of '20da4afff35d564aea592b84f340be967b3449b1'
|
| Fri, 28 Sep 2007 18:37:19 +0000 |
Richard Laager |
Bump version to 2.2.2devel
|
| Fri, 28 Sep 2007 18:23:54 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 7494c5484079eedcf158172f4208be3f986c068f)
|
| Fri, 28 Sep 2007 17:20:33 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 193dd268b0be5ca0a4a8fa0e4188452907114be0)
|
| Fri, 28 Sep 2007 17:05:40 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 09dfc47173cdfafc1f6ce225dcdc21d7e8968a9b)
|
| Fri, 28 Sep 2007 17:02:11 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin.2.2.1' (head ea712a6deb43cdbf10f75764fee853af196c6095)
|
| Fri, 28 Sep 2007 17:01:20 +0000 |
Richard Laager |
explicit merge of '0b88f009442a340d4269c95605f580a9f444e767'
|
