libpurple/protocols/jabber/XEPS@77664079d0f0 (annotated)
libpurple/protocols/jabber/XEPS
Mon, 20 Jan 2014 00:02:17 -0800
- author
- Mark Doliner <mark@kingant.net>
- date
- Mon, 20 Jan 2014 00:02:17 -0800
- changeset 35265
- 77664079d0f0
- parent 28845
- e13e49289770
- child 29195
- 60308d3345ec
- permissions
- -rw-r--r--
Merge with a fair number of conflicts. Nothing too crazy.
I didn't merge a lot of changes from 07e827917960
libpurple/protocols/gg/gg.c I think maybe that code has either been
removed or changed significantly in main.
| 7014 | 1 | 0060: NEED |
| 2 | Pub-Sub | |
| 3 | 0080: NEED (Do we?) | |
| 4 | Geographic Location Information |
