Commit 52f85473 authored by Michael Meeks's avatar Michael Meeks

Merge remote branch 'origin/gnome-3' into gnome-3

Conflicts:
	main-menu/src/hard-drive-status-tile.c
	main-menu/src/main-menu-migration.c
	main-menu/src/main-menu-ui.c
parents 33c4a4a9 ea0b4992
......@@ -69,7 +69,7 @@ move_system_area_to_new_set ()
g_object_unref (filestream);
g_object_unref (file);
g_free (filename);
filename = g_build_filename (
g_get_user_data_dir (), PACKAGE, SYSTEM_BOOKMARK_FILENAME, NULL);
if (g_file_test (filename, G_FILE_TEST_EXISTS))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment