Mercurial > pidgin
changeset 16541:993baf4f7725
merge of '2f0c460433a1e198af1a0f225b83bce2c201ab32'
and '47c411922fefd78d450f54da32cad6b5b3bd78f1'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 28 Apr 2007 00:13:16 +0000 |
| parents | 8748c83af14f (current diff) 478bc85c4aec (diff) |
| children | ec8a3ca95a13 |
| files | |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/core.c Sat Apr 28 00:11:25 2007 +0000 +++ b/libpurple/core.c Sat Apr 28 00:13:16 2007 +0000 @@ -310,7 +310,6 @@ gboolean purple_core_migrate(void) { -#error You probably want to back up your .gaim directory right now. This revision is going to destroy it, potentially not in the way we've intended const char *user_dir = purple_user_dir(); char *old_user_dir = g_strconcat(purple_home_dir(), G_DIR_SEPARATOR_S ".gaim", NULL);