Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/servconn.h @ 31292:47b6eda87723
propagate from branch 'im.pidgin.pidgin' (head 07d0765c444a097af45c2650f54323afb900a07b)
to branch 'im.pidgin.soc.2010.msn-tlc' (head f3998422a4724ab424e4e2328f58fc0504856557)
| author | masca@cpw.pidgin.im |
|---|---|
| date | Mon, 19 Jul 2010 21:11:32 +0000 |
| parents | 98c5f0865838 |
| children |
comparison
equal
deleted
inserted
replaced
| 30698:e874875a74a7 | 31292:47b6eda87723 |
|---|---|
| 44 { | 44 { |
| 45 MSN_SERVCONN_NS, | 45 MSN_SERVCONN_NS, |
| 46 MSN_SERVCONN_SB | 46 MSN_SERVCONN_SB |
| 47 } MsnServConnType; | 47 } MsnServConnType; |
| 48 | 48 |
| 49 #include "internal.h" | |
| 49 #include "proxy.h" | 50 #include "proxy.h" |
| 50 | 51 |
| 51 #include "cmdproc.h" | 52 #include "cmdproc.h" |
| 52 #include "httpconn.h" | 53 #include "httpconn.h" |
| 53 #include "session.h" | 54 #include "session.h" |