Mercurial > pidgin
comparison libpurple/core.c @ 25347:7e2f27351358
Clean up merges from the last two (un)disapprovals.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 20 Jan 2009 04:45:56 +0000 |
| parents | 59ce16832872 |
| children | fc8fd4fef166 3687049b4faf |
comparison
equal
deleted
inserted
replaced
| 25346:59ce16832872 | 25347:7e2f27351358 |
|---|---|
| 249 g_free(core); | 249 g_free(core); |
| 250 | 250 |
| 251 #ifdef _WIN32 | 251 #ifdef _WIN32 |
| 252 wpurple_cleanup(); | 252 wpurple_cleanup(); |
| 253 #endif | 253 #endif |
| 254 purple_prefs_uninit(); | |
| 255 | 254 |
| 256 _core = NULL; | 255 _core = NULL; |
| 257 } | 256 } |
| 258 | 257 |
| 259 gboolean | 258 gboolean |