| Sat, 29 Sep 2007 13:00:50 +0000 |
Luke Schierer |
propagate from branch 'im.pidgin.pidgin.2.2.1' (head d80b73af2a76c9ef004532af875209973de125b5)
|
| Sat, 29 Sep 2007 05:11:04 +0000 |
William Ehlhardt |
- Notify on NULL strings instead of just crashing
|
| Sat, 29 Sep 2007 04:59:50 +0000 |
William Ehlhardt |
merge of '27d49044df2da785a519726b37211c6c5218bc41'
|
| Sat, 29 Sep 2007 04:24:05 +0000 |
William Ehlhardt |
- Delete a strcmp that doesn't do anything useful and potentially causes
|
| Sat, 29 Sep 2007 04:01:14 +0000 |
William Ehlhardt |
- Apply pidgin-old-gnutls-bugfixes.patch from #3192 with slight
|
| Sat, 29 Sep 2007 03:44:34 +0000 |
William Ehlhardt |
- Apply pidgin-old-gnutls-types.patch from #3192. This fixes problems
|
| Sat, 29 Sep 2007 02:50:14 +0000 |
Daniel Atallah |
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 39fb78e8732dc4465a2c4908c796df3d745b752c)
|
| 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'
|
