Need cvs surgery

[Rachel Hestilow <hestilow ximian com>]

Hi, we are merging gnome-control-center and control-center-plus on the
branch "gnome-1-4-branch". I need the following files moved from
control-center-plus to gnome-control-center on said branch. If anyone
has access to the cvs server and is up to the task, it'd be much
appreciated.

Thanks,
Rachel


Files to be moved:

capplets/desktop-links
capplets/desktop-links/Advanced.directory.in.in
capplets/desktop-links/advanced-directory.png
capplets/desktop-links/cd-capplet.png
capplets/desktop-links/cd.desktop.in.in
capplets/desktop-links/legacy-applications-capplet.png
capplets/desktop-links/legacy-applications.desktop.in.in
capplets/desktop-links/panel-capplet.png
capplets/desktop-links/panel.desktop.in.in
capplets/desktop-links/session-capplet.png
capplets/desktop-links/session.desktop.in.in
capplets/desktop-links/Sawfish
capplets/desktop-links/Sawfish/Makefile.am
capplets/desktop-links/Sawfish/Sawfish.directory.in.in
capplets/desktop-links/Sawfish/appearance-properties.desktop.in
capplets/desktop-links/Sawfish/bindings-properties.desktop.in
capplets/desktop-links/Sawfish/focus-properties.desktop.in
capplets/desktop-links/Sawfish/match-properties.desktop.in
capplets/desktop-links/Sawfish/maximize-properties.desktop.in
capplets/desktop-links/Sawfish/meta-properties.desktop.in
capplets/desktop-links/Sawfish/misc-properties.desktop.in
capplets/desktop-links/Sawfish/move-properties.desktop.in
capplets/desktop-links/Sawfish/placement-properties.desktop.in
capplets/desktop-links/Sawfish/sawfish-group.png
capplets/desktop-links/Sawfish/sound-properties.desktop.in
capplets/desktop-links/Sawfish/workspace-properties.desktop.in
capplets/file-types
capplets/file-types/ChangeLog
capplets/file-types/Makefile.am
capplets/file-types/file-types-capplet-dialogs.c
capplets/file-types/file-types-capplet-dialogs.h
capplets/file-types/file-types-capplet.c
capplets/file-types/file-types-capplet.desktop.in
capplets/file-types/file-types-capplet.h
capplets/file-types/file-types-capplet.png
capplets/file-types/file-types-icon-entry.c
capplets/file-types/file-types-icon-entry.h
capplets/file-types/file-types-properties.glade
capplets/file-types/file-types.desktop.in.in
capplets/file-types/libuuid
capplets/file-types/libuuid/Makefile.am
capplets/file-types/libuuid/clear.c
capplets/file-types/libuuid/compare.c
capplets/file-types/libuuid/copy.c
capplets/file-types/libuuid/gen_uuid.c
capplets/file-types/libuuid/gen_uuid_nt.c
capplets/file-types/libuuid/isnull.c
capplets/file-types/libuuid/pack.c
capplets/file-types/libuuid/parse.c
capplets/file-types/libuuid/tst_uuid.c
capplets/file-types/libuuid/unpack.c
capplets/file-types/libuuid/unparse.c
capplets/file-types/libuuid/uuid.h
capplets/file-types/libuuid/uuidP.h
capplets/file-types/libuuid/uuid_time.c
capplets/mime-type
capplets/mime-type/ChangeLog
capplets/mime-type/Makefile.am
capplets/mime-type/edit-window.c
capplets/mime-type/edit-window.h
capplets/mime-type/mime-data.c
capplets/mime-type/mime-data.h
capplets/mime-type/mime-info.c
capplets/mime-type/mime-info.h
capplets/mime-type/mime-type-capplet.c
capplets/mime-type/mime-type-capplet.png
capplets/mime-type/mime-type-properties.glade
capplets/mime-type/mime-type.desktop.in.in
capplets/mime-type/new-mime-window.c
capplets/mime-type/new-mime-window.h
capplets/theme-switcher
capplets/theme-switcher/ChangeLog
capplets/theme-switcher/Makefile.am
capplets/theme-switcher/da.h
capplets/theme-switcher/demo.c
capplets/theme-switcher/file.c
capplets/theme-switcher/globals.c
capplets/theme-switcher/gtk-theme-selector-capplet.png
capplets/theme-switcher/gtk-theme-selector-properties.glade
capplets/theme-switcher/gtk-theme-selector.desktop.in.in
capplets/theme-switcher/gui.c
capplets/theme-switcher/install.c
capplets/theme-switcher/lister.c
capplets/theme-switcher/main.c
capplets/theme-switcher/signals.c
capplets/theme-switcher/theme-switcher-capplet.png
capplets/ui-properties
capplets/ui-properties/ChangeLog
capplets/ui-properties/Makefile.am
capplets/ui-properties/behavior-capplet.png
capplets/ui-properties/behavior-properties.glade
capplets/ui-properties/behavior.desktop.in.in
capplets/ui-properties/gnome-warning.png
capplets/ui-properties/main.c
capplets/ui-properties/preferences.c
capplets/ui-properties/preferences.h
capplets/ui-properties/prefs-widget-app.c
capplets/ui-properties/prefs-widget-app.h
capplets/ui-properties/prefs-widget-dialogs.c
capplets/ui-properties/prefs-widget-dialogs.h
capplets/ui-properties/prefs-widget-mdi.c
capplets/ui-properties/prefs-widget-mdi.h
capplets/ui-properties/prefs-widget.c
capplets/ui-properties/prefs-widget.h
capplets/ui-properties/ui-properties.glade
capplets/ui-properties/ui-properties.glade.h
capplets/url-properties
capplets/url-properties/ChangeLog
capplets/url-properties/Makefile.am
capplets/url-properties/url-capplet.png
capplets/url-properties/url-properties.c
capplets/url-properties/url-properties.desktop.in
capplets/url-properties/url-properties.glade
capplets/url-properties/url-properties_WITH_TRANSLATIONS
capplets/url-properties/url.desktop.in.in
capplets/wm-properties
capplets/wm-properties/ChangeLog
capplets/wm-properties/Makefile.am
capplets/wm-properties/wm-capplet.png
capplets/wm-properties/wm-exec.c
capplets/wm-properties/wm-list.c
capplets/wm-properties/wm-properties-capplet.c
capplets/wm-properties/wm-properties.glade
capplets/wm-properties/wm-properties.h
capplets/wm-properties/wm.desktop.in.in
capplets/wm-properties/wm-desktops
capplets/wm-properties/wm-desktops/Enlightenment.desktop.in.in
capplets/wm-properties/wm-desktops/IceWM.desktop.in.in
capplets/wm-properties/wm-desktops/Makefile.am
capplets/wm-properties/wm-desktops/Scwm.desktop.in.in
capplets/wm-properties/wm-desktops/WindowMaker.desktop.in.in
capplets/wm-properties/wm-desktops/twm.desktop.in.in