[22264] in Source-Commits
third/nautilus - Imported sources
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Fri Mar 11 13:40:53 2005
From: ghudson@MIT.EDU
Date: Fri, 11 Mar 2005 13:40:43 -0500
Message-Id: <200503111840.j2BIehRC010886@equal-rites.mit.edu>
To: source-commits@MIT.EDU
Update of /afs/dev.mit.edu/source/repository/third/nautilus
In directory equal-rites.mit.edu:/tmp/import.10773/nautilus-2.8.2
Log Message:
Import nautilus 2.8.2.
Status:
Vendor Tag: vendor
Release Tags: nautilus-2_8_2
U third/nautilus/Makefile.in
U third/nautilus/README
U third/nautilus/stamp-h.in
U third/nautilus/AUTHORS
U third/nautilus/COPYING
U third/nautilus/COPYING.LIB
U third/nautilus/ChangeLog
U third/nautilus/INSTALL
U third/nautilus/Makefile.am
U third/nautilus/NEWS
U third/nautilus/THANKS
U third/nautilus/TODO
U third/nautilus/acconfig.h
U third/nautilus/aclocal.m4
U third/nautilus/config.guess
U third/nautilus/config.h.in
U third/nautilus/config.sub
C third/nautilus/configure
C third/nautilus/configure.in
U third/nautilus/install-sh
U third/nautilus/ltmain.sh
U third/nautilus/missing
U third/nautilus/mkinstalldirs
U third/nautilus/nautilus.spec.in
U third/nautilus/COPYING-DOCS
U third/nautilus/HACKING
U third/nautilus/MAINTAINERS
C third/nautilus/nautilus.desktop
U third/nautilus/nautilus.desktop.in
U third/nautilus/ChangeLog-20000414
U third/nautilus/ChangeLog-20000625
U third/nautilus/ChangeLog-20000831
U third/nautilus/ChangeLog-20001018
U third/nautilus/intltool-extract.in
U third/nautilus/intltool-merge.in
U third/nautilus/intltool-update.in
U third/nautilus/Makefile.shared
U third/nautilus/add-include-prefix
U third/nautilus/nautilus-home.desktop.in
U third/nautilus/nautilus-computer.desktop.in
U third/nautilus/nautilus-file-management-properties.desktop.in
U third/nautilus/nautilus-home.desktop
U third/nautilus/nautilus-computer.desktop
U third/nautilus/nautilus-file-management-properties.desktop
U third/nautilus/nautilus.spec
U third/nautilus/libnautilus/Makefile.in
U third/nautilus/libnautilus/README
U third/nautilus/libnautilus/Makefile.am
U third/nautilus/libnautilus/libnautilus.pc.in
U third/nautilus/libnautilus/nautilus-clipboard.c
U third/nautilus/libnautilus/nautilus-idle-queue.c
U third/nautilus/libnautilus/nautilus-scroll-positionable.c
U third/nautilus/libnautilus/nautilus-undo-transaction.c
U third/nautilus/libnautilus/nautilus-undo-transaction.h
U third/nautilus/libnautilus/nautilus-undo.c
U third/nautilus/libnautilus/nautilus-view.c
U third/nautilus/libnautilus/nautilus-view-standard-main.c
U third/nautilus/libnautilus/libnautilus.h
U third/nautilus/libnautilus/nautilus-bonobo-ui.h
U third/nautilus/libnautilus/nautilus-clipboard.h
U third/nautilus/libnautilus/nautilus-idle-queue.h
U third/nautilus/libnautilus/nautilus-scroll-positionable.h
U third/nautilus/libnautilus/nautilus-view.h
U third/nautilus/libnautilus/nautilus-view-standard-main.h
U third/nautilus/libnautilus/nautilus-undo.h
U third/nautilus/libnautilus/nautilus-undo-private.h
U third/nautilus/libnautilus/nautilus-clipboard-ui.xml
U third/nautilus/libnautilus/nautilus-view-component.idl
U third/nautilus/libnautilus/nautilus-distributed-undo.idl
U third/nautilus/libnautilus-extension/Makefile.in
U third/nautilus/libnautilus-extension/Makefile.am
U third/nautilus/libnautilus-extension/libnautilus-extension.pc.in
U third/nautilus/libnautilus-extension/nautilus-column.c
U third/nautilus/libnautilus-extension/nautilus-column-provider.c
U third/nautilus/libnautilus-extension/nautilus-extension-i18n.h
U third/nautilus/libnautilus-extension/nautilus-extension-types.c
U third/nautilus/libnautilus-extension/nautilus-file-info.c
U third/nautilus/libnautilus-extension/nautilus-menu-item.c
U third/nautilus/libnautilus-extension/nautilus-menu-provider.c
U third/nautilus/libnautilus-extension/nautilus-property-page.c
U third/nautilus/libnautilus-extension/nautilus-property-page-provider.c
U third/nautilus/libnautilus-extension/nautilus-info-provider.c
U third/nautilus/libnautilus-extension/nautilus-column.h
U third/nautilus/libnautilus-extension/nautilus-column-provider.h
U third/nautilus/libnautilus-extension/nautilus-extension-types.h
U third/nautilus/libnautilus-extension/nautilus-file-info.h
U third/nautilus/libnautilus-extension/nautilus-menu-item.h
U third/nautilus/libnautilus-extension/nautilus-menu-provider.h
U third/nautilus/libnautilus-extension/nautilus-property-page.h
U third/nautilus/libnautilus-extension/nautilus-property-page-provider.h
U third/nautilus/libnautilus-extension/nautilus-info-provider.h
U third/nautilus/cut-n-paste-code/Makefile.in
U third/nautilus/cut-n-paste-code/README
U third/nautilus/cut-n-paste-code/Makefile.am
U third/nautilus/cut-n-paste-code/widgets/Makefile.in
U third/nautilus/cut-n-paste-code/widgets/Makefile.am
U third/nautilus/cut-n-paste-code/widgets/gimphwrapbox/Makefile.in
U third/nautilus/cut-n-paste-code/widgets/gimphwrapbox/Makefile.am
U third/nautilus/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c
U third/nautilus/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c
U third/nautilus/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.h
U third/nautilus/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h
U third/nautilus/cut-n-paste-code/libegg/Makefile.in
U third/nautilus/cut-n-paste-code/libegg/Makefile.am
U third/nautilus/cut-n-paste-code/libegg/egg-recent-model.c
U third/nautilus/cut-n-paste-code/libegg/egg-recent-model.h
U third/nautilus/cut-n-paste-code/libegg/egg-recent-item.c
U third/nautilus/cut-n-paste-code/libegg/egg-recent-item.h
U third/nautilus/cut-n-paste-code/libegg/eggtreemultidnd.c
U third/nautilus/cut-n-paste-code/libegg/eggtreemultidnd.h
U third/nautilus/cut-n-paste-code/libegg/update-from-egg.sh
U third/nautilus/cut-n-paste-code/gsequence/Makefile.in
U third/nautilus/cut-n-paste-code/gsequence/Makefile.am
U third/nautilus/cut-n-paste-code/gsequence/gsequence.c
U third/nautilus/cut-n-paste-code/gsequence/gsequence.h
U third/nautilus/libbackground/Makefile.in
U third/nautilus/libbackground/ChangeLog
U third/nautilus/libbackground/Makefile.am
U third/nautilus/libbackground/applier.c
U third/nautilus/libbackground/applier.h
U third/nautilus/libbackground/preferences.c
U third/nautilus/libbackground/preferences.h
U third/nautilus/libnautilus-private/Makefile.in
U third/nautilus/libnautilus-private/README
U third/nautilus/libnautilus-private/Makefile.am
U third/nautilus/libnautilus-private/nautilus-audio-player.c
U third/nautilus/libnautilus-private/nautilus-audio-player.h
U third/nautilus/libnautilus-private/nautilus-bonobo-extensions.c
U third/nautilus/libnautilus-private/nautilus-bonobo-extensions.h
U third/nautilus/libnautilus-private/nautilus-bookmark.c
U third/nautilus/libnautilus-private/nautilus-bookmark.h
U third/nautilus/libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.c
U third/nautilus/libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.h
U third/nautilus/libnautilus-private/nautilus-cdrom-extensions.h
U third/nautilus/libnautilus-private/nautilus-clipboard-monitor.c
U third/nautilus/libnautilus-private/nautilus-clipboard-monitor.h
U third/nautilus/libnautilus-private/nautilus-column-chooser.c
U third/nautilus/libnautilus-private/nautilus-column-chooser.h
U third/nautilus/libnautilus-private/nautilus-column-utilities.c
U third/nautilus/libnautilus-private/nautilus-column-utilities.h
U third/nautilus/libnautilus-private/nautilus-customization-data.c
U third/nautilus/libnautilus-private/nautilus-customization-data.h
U third/nautilus/libnautilus-private/nautilus-default-file-icon.c
U third/nautilus/libnautilus-private/nautilus-default-file-icon.h
U third/nautilus/libnautilus-private/nautilus-desktop-directory.c
U third/nautilus/libnautilus-private/nautilus-desktop-directory.h
U third/nautilus/libnautilus-private/nautilus-desktop-directory-file.c
U third/nautilus/libnautilus-private/nautilus-desktop-directory-file.h
U third/nautilus/libnautilus-private/nautilus-desktop-icon-file.c
U third/nautilus/libnautilus-private/nautilus-desktop-icon-file.h
U third/nautilus/libnautilus-private/nautilus-desktop-link.c
U third/nautilus/libnautilus-private/nautilus-desktop-link.h
U third/nautilus/libnautilus-private/nautilus-desktop-link-monitor.c
U third/nautilus/libnautilus-private/nautilus-desktop-link-monitor.h
U third/nautilus/libnautilus-private/nautilus-directory-async.c
U third/nautilus/libnautilus-private/nautilus-directory-background.c
U third/nautilus/libnautilus-private/nautilus-directory-background.h
U third/nautilus/libnautilus-private/nautilus-directory-metafile-monitor.c
U third/nautilus/libnautilus-private/nautilus-directory-metafile-monitor.h
U third/nautilus/libnautilus-private/nautilus-directory-metafile.c
U third/nautilus/libnautilus-private/nautilus-directory-metafile.h
U third/nautilus/libnautilus-private/nautilus-directory-notify.h
U third/nautilus/libnautilus-private/nautilus-directory-private.h
U third/nautilus/libnautilus-private/nautilus-directory.c
U third/nautilus/libnautilus-private/nautilus-directory.h
U third/nautilus/libnautilus-private/nautilus-dnd.c
U third/nautilus/libnautilus-private/nautilus-dnd.h
U third/nautilus/libnautilus-private/nautilus-drag-window.c
U third/nautilus/libnautilus-private/nautilus-drag-window.h
U third/nautilus/libnautilus-private/nautilus-emblem-utils.c
U third/nautilus/libnautilus-private/nautilus-emblem-utils.h
U third/nautilus/libnautilus-private/nautilus-entry.c
U third/nautilus/libnautilus-private/nautilus-entry.h
U third/nautilus/libnautilus-private/nautilus-file-attributes.h
U third/nautilus/libnautilus-private/nautilus-file-changes-queue.c
U third/nautilus/libnautilus-private/nautilus-file-changes-queue.h
U third/nautilus/libnautilus-private/nautilus-file-dnd.c
U third/nautilus/libnautilus-private/nautilus-file-dnd.h
U third/nautilus/libnautilus-private/nautilus-file-operations-progress.c
U third/nautilus/libnautilus-private/nautilus-file-operations-progress.h
U third/nautilus/libnautilus-private/nautilus-file-operations-progress-icons.h
U third/nautilus/libnautilus-private/nautilus-file-operations.c
U third/nautilus/libnautilus-private/nautilus-file-operations.h
U third/nautilus/libnautilus-private/nautilus-file-private.h
U third/nautilus/libnautilus-private/nautilus-file-queue.c
U third/nautilus/libnautilus-private/nautilus-file-queue.h
U third/nautilus/libnautilus-private/nautilus-file-utilities.c
U third/nautilus/libnautilus-private/nautilus-file-utilities.h
U third/nautilus/libnautilus-private/nautilus-file.c
U third/nautilus/libnautilus-private/nautilus-file.h
U third/nautilus/libnautilus-private/nautilus-global-preferences.c
U third/nautilus/libnautilus-private/nautilus-global-preferences.h
U third/nautilus/libnautilus-private/nautilus-horizontal-splitter.c
U third/nautilus/libnautilus-private/nautilus-horizontal-splitter.h
U third/nautilus/libnautilus-private/nautilus-icon-canvas-item.c
U third/nautilus/libnautilus-private/nautilus-icon-canvas-item.h
U third/nautilus/libnautilus-private/nautilus-icon-container.c
U third/nautilus/libnautilus-private/nautilus-icon-container.h
U third/nautilus/libnautilus-private/nautilus-icon-dnd.c
U third/nautilus/libnautilus-private/nautilus-icon-dnd.h
U third/nautilus/libnautilus-private/nautilus-icon-factory-private.h
U third/nautilus/libnautilus-private/nautilus-icon-factory.c
U third/nautilus/libnautilus-private/nautilus-icon-factory.h
U third/nautilus/libnautilus-private/nautilus-icon-private.h
U third/nautilus/libnautilus-private/nautilus-iso9660.h
U third/nautilus/libnautilus-private/nautilus-keep-last-vertical-box.c
U third/nautilus/libnautilus-private/nautilus-keep-last-vertical-box.h
U third/nautilus/libnautilus-private/nautilus-lib-self-check-functions.c
U third/nautilus/libnautilus-private/nautilus-lib-self-check-functions.h
U third/nautilus/libnautilus-private/nautilus-link-desktop-file.c
U third/nautilus/libnautilus-private/nautilus-link-desktop-file.h
U third/nautilus/libnautilus-private/nautilus-link-historical.c
U third/nautilus/libnautilus-private/nautilus-link-historical.h
U third/nautilus/libnautilus-private/nautilus-link.c
U third/nautilus/libnautilus-private/nautilus-link.h
U third/nautilus/libnautilus-private/nautilus-marshal.c
U third/nautilus/libnautilus-private/nautilus-medusa-support.c
U third/nautilus/libnautilus-private/nautilus-medusa-support.h
U third/nautilus/libnautilus-private/nautilus-merged-directory.c
U third/nautilus/libnautilus-private/nautilus-merged-directory.h
U third/nautilus/libnautilus-private/nautilus-metadata.h
U third/nautilus/libnautilus-private/nautilus-metafile-factory.c
U third/nautilus/libnautilus-private/nautilus-metafile-factory.h
U third/nautilus/libnautilus-private/nautilus-metafile.c
U third/nautilus/libnautilus-private/nautilus-metafile.h
U third/nautilus/libnautilus-private/nautilus-mime-actions.c
U third/nautilus/libnautilus-private/nautilus-mime-actions.h
U third/nautilus/libnautilus-private/nautilus-module.c
U third/nautilus/libnautilus-private/nautilus-module.h
U third/nautilus/libnautilus-private/nautilus-monitor.c
U third/nautilus/libnautilus-private/nautilus-monitor.h
U third/nautilus/libnautilus-private/nautilus-program-choosing.c
U third/nautilus/libnautilus-private/nautilus-program-choosing.h
U third/nautilus/libnautilus-private/nautilus-recent.h
U third/nautilus/libnautilus-private/nautilus-recent.c
U third/nautilus/libnautilus-private/nautilus-search-uri.c
U third/nautilus/libnautilus-private/nautilus-search-uri.h
U third/nautilus/libnautilus-private/nautilus-sidebar-functions.c
U third/nautilus/libnautilus-private/nautilus-sidebar-functions.h
U third/nautilus/libnautilus-private/nautilus-sound.c
U third/nautilus/libnautilus-private/nautilus-sound.h
U third/nautilus/libnautilus-private/nautilus-theme.c
U third/nautilus/libnautilus-private/nautilus-theme.h
U third/nautilus/libnautilus-private/nautilus-thumbnails.c
U third/nautilus/libnautilus-private/nautilus-thumbnails.h
U third/nautilus/libnautilus-private/nautilus-trash-directory.c
U third/nautilus/libnautilus-private/nautilus-trash-directory.h
U third/nautilus/libnautilus-private/nautilus-trash-file.c
U third/nautilus/libnautilus-private/nautilus-trash-file.h
U third/nautilus/libnautilus-private/nautilus-trash-monitor.c
U third/nautilus/libnautilus-private/nautilus-trash-monitor.h
U third/nautilus/libnautilus-private/nautilus-tree-view-drag-dest.c
U third/nautilus/libnautilus-private/nautilus-tree-view-drag-dest.h
U third/nautilus/libnautilus-private/nautilus-undo-context.c
U third/nautilus/libnautilus-private/nautilus-undo-context.h
U third/nautilus/libnautilus-private/nautilus-undo-manager.c
U third/nautilus/libnautilus-private/nautilus-undo-manager.h
U third/nautilus/libnautilus-private/nautilus-undo-signal-handlers.c
U third/nautilus/libnautilus-private/nautilus-undo-signal-handlers.h
U third/nautilus/libnautilus-private/nautilus-vfs-directory.c
U third/nautilus/libnautilus-private/nautilus-vfs-directory.h
U third/nautilus/libnautilus-private/nautilus-vfs-file.c
U third/nautilus/libnautilus-private/nautilus-vfs-file.h
U third/nautilus/libnautilus-private/nautilus-view-identifier.c
U third/nautilus/libnautilus-private/nautilus-view-identifier.h
U third/nautilus/libnautilus-private/nautilus-view-query.c
U third/nautilus/libnautilus-private/nautilus-view-query.h
U third/nautilus/libnautilus-private/nautilus-metafile-server.idl
U third/nautilus/libnautilus-private/nautilus-marshal.list
U third/nautilus/libnautilus-private/apps_nautilus_preferences.schemas.in
U third/nautilus/libnautilus-adapter/Makefile.in
U third/nautilus/libnautilus-adapter/Makefile.am
U third/nautilus/libnautilus-adapter/nautilus-adapter-factory.idl
U third/nautilus/src/Makefile.in
U third/nautilus/src/Makefile.am
U third/nautilus/src/nautilus-applicable-views.c
C third/nautilus/src/nautilus-application.c
U third/nautilus/src/nautilus-bookmark-list.c
U third/nautilus/src/nautilus-bookmark-parsing.c
U third/nautilus/src/nautilus-bookmarks-window.c
U third/nautilus/src/nautilus-complex-search-bar.c
U third/nautilus/src/nautilus-component-adapter-factory.c
U third/nautilus/src/nautilus-connect-server-dialog.c
U third/nautilus/src/nautilus-desktop-window.c
U third/nautilus/src/nautilus-first-time-druid.c
U third/nautilus/src/nautilus-information-panel.c
U third/nautilus/src/nautilus-location-bar.c
U third/nautilus/src/nautilus-location-dialog.c
U third/nautilus/src/nautilus-location-entry.c
U third/nautilus/src/nautilus-main.c
U third/nautilus/src/nautilus-navigation-bar.c
U third/nautilus/src/nautilus-navigation-window.c
U third/nautilus/src/nautilus-navigation-window-menus.c
U third/nautilus/src/nautilus-profiler.c
U third/nautilus/src/nautilus-property-browser.c
U third/nautilus/src/nautilus-search-bar-criterion.c
U third/nautilus/src/nautilus-search-bar.c
U third/nautilus/src/nautilus-self-check-functions.c
U third/nautilus/src/nautilus-shell.c
U third/nautilus/src/nautilus-side-pane.c
U third/nautilus/src/nautilus-sidebar-title.c
U third/nautilus/src/nautilus-signaller.c
U third/nautilus/src/nautilus-simple-search-bar.c
U third/nautilus/src/nautilus-spatial-window.c
U third/nautilus/src/nautilus-switchable-navigation-bar.c
U third/nautilus/src/nautilus-switchable-search-bar.c
U third/nautilus/src/nautilus-window-toolbars.c
U third/nautilus/src/nautilus-view-frame-corba.c
U third/nautilus/src/nautilus-view-frame.c
U third/nautilus/src/nautilus-window-manage-views.c
U third/nautilus/src/nautilus-window-menus.c
U third/nautilus/src/nautilus-window.c
U third/nautilus/src/nautilus-zoom-control.c
U third/nautilus/src/nautilus-applicable-views.h
U third/nautilus/src/nautilus-application.h
U third/nautilus/src/nautilus-bookmark-list.h
U third/nautilus/src/nautilus-bookmark-parsing.h
U third/nautilus/src/nautilus-bookmarks-window.h
U third/nautilus/src/nautilus-complex-search-bar.h
U third/nautilus/src/nautilus-component-adapter-factory.h
U third/nautilus/src/nautilus-connect-server-dialog.h
U third/nautilus/src/nautilus-desktop-window.h
U third/nautilus/src/nautilus-first-time-druid.h
U third/nautilus/src/nautilus-information-panel.h
U third/nautilus/src/nautilus-location-bar.h
U third/nautilus/src/nautilus-location-dialog.h
U third/nautilus/src/nautilus-location-entry.h
U third/nautilus/src/nautilus-main.h
U third/nautilus/src/nautilus-navigation-bar.h
U third/nautilus/src/nautilus-navigation-window.h
U third/nautilus/src/nautilus-profiler.h
U third/nautilus/src/nautilus-property-browser.h
U third/nautilus/src/nautilus-search-bar-criterion-private.h
U third/nautilus/src/nautilus-search-bar-criterion.h
U third/nautilus/src/nautilus-search-bar-private.h
U third/nautilus/src/nautilus-search-bar.h
U third/nautilus/src/nautilus-self-check-functions.h
U third/nautilus/src/nautilus-shell.h
U third/nautilus/src/nautilus-side-pane.h
U third/nautilus/src/nautilus-sidebar-title.h
U third/nautilus/src/nautilus-signaller.h
U third/nautilus/src/nautilus-simple-search-bar.h
U third/nautilus/src/nautilus-spatial-window.h
U third/nautilus/src/nautilus-switchable-navigation-bar.h
U third/nautilus/src/nautilus-switchable-search-bar.h
U third/nautilus/src/nautilus-view-frame-private.h
U third/nautilus/src/nautilus-view-frame.h
U third/nautilus/src/nautilus-window-manage-views.h
U third/nautilus/src/nautilus-window-private.h
U third/nautilus/src/nautilus-window.h
U third/nautilus/src/nautilus-zoom-control.h
U third/nautilus/src/nautilus-file-management-properties.c
U third/nautilus/src/nautilus-file-management-properties.h
U third/nautilus/src/nautilus-file-management-properties-main.c
U third/nautilus/src/Nautilus_shell.server.in
U third/nautilus/src/Nautilus_shell.server
U third/nautilus/src/nautilus-bookmarks-window.glade
U third/nautilus/src/nautilus-file-management-properties.glade
U third/nautilus/src/nautilus-shell-ui.xml
U third/nautilus/src/nautilus-navigation-window-ui.xml
U third/nautilus/src/nautilus-spatial-window-ui.xml
U third/nautilus/src/check-nautilus
U third/nautilus/src/nautilus-shell-interface.idl
U third/nautilus/src/network-scheme.desktop.in
U third/nautilus/src/network-scheme.desktop
U third/nautilus/src/file-manager/Makefile.in
U third/nautilus/src/file-manager/Makefile.am
U third/nautilus/src/file-manager/fm-bonobo-provider.c
U third/nautilus/src/file-manager/fm-desktop-icon-view.c
U third/nautilus/src/file-manager/fm-directory-view.c
U third/nautilus/src/file-manager/fm-ditem-page.c
U third/nautilus/src/file-manager/fm-error-reporting.c
U third/nautilus/src/file-manager/fm-icon-container.c
U third/nautilus/src/file-manager/fm-icon-view.c
U third/nautilus/src/file-manager/fm-list-model.c
U third/nautilus/src/file-manager/fm-list-view.c
U third/nautilus/src/file-manager/fm-properties-window.c
U third/nautilus/src/file-manager/fm-search-list-view.c
U third/nautilus/src/file-manager/nautilus-indexing-info.c
U third/nautilus/src/file-manager/fm-tree-model.c
U third/nautilus/src/file-manager/fm-tree-view.c
U third/nautilus/src/file-manager/fm-bonobo-provider.h
U third/nautilus/src/file-manager/fm-desktop-icon-view.h
U third/nautilus/src/file-manager/fm-directory-view.h
U third/nautilus/src/file-manager/fm-ditem-page.h
U third/nautilus/src/file-manager/fm-error-reporting.h
U third/nautilus/src/file-manager/fm-icon-container.h
U third/nautilus/src/file-manager/fm-icon-view.h
U third/nautilus/src/file-manager/fm-list-model.h
U third/nautilus/src/file-manager/fm-list-view-private.h
U third/nautilus/src/file-manager/fm-list-view.h
U third/nautilus/src/file-manager/fm-properties-window.h
U third/nautilus/src/file-manager/fm-search-list-view.h
U third/nautilus/src/file-manager/nautilus-indexing-info.h
U third/nautilus/src/file-manager/fm-tree-model.h
U third/nautilus/src/file-manager/fm-tree-view.h
U third/nautilus/src/file-manager/nautilus-desktop-icon-view-ui.xml
U third/nautilus/src/file-manager/nautilus-directory-view-ui.xml
U third/nautilus/src/file-manager/nautilus-icon-view-ui.xml
U third/nautilus/src/file-manager/nautilus-list-view-ui.xml
U third/nautilus/src/file-manager/nautilus-search-list-view-ui.xml
U third/nautilus/test/Makefile.in
U third/nautilus/test/Makefile.am
U third/nautilus/test/test-nautilus-wrap-table.c
U third/nautilus/test/test.c
U third/nautilus/test/test.h
U third/nautilus/components/Makefile.in
U third/nautilus/components/Makefile.am
U third/nautilus/components/adapter/Makefile.in
U third/nautilus/components/adapter/Makefile.am
U third/nautilus/components/adapter/main.c
U third/nautilus/components/adapter/nautilus-adapter-control-embed-strategy.c
U third/nautilus/components/adapter/nautilus-adapter-control-embed-strategy.h
U third/nautilus/components/adapter/nautilus-adapter-embed-strategy-private.h
U third/nautilus/components/adapter/nautilus-adapter-embed-strategy.c
U third/nautilus/components/adapter/nautilus-adapter-embed-strategy.h
U third/nautilus/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
U third/nautilus/components/adapter/nautilus-adapter-control-factory-embed-strategy.h
U third/nautilus/components/adapter/nautilus-adapter-factory-server.c
U third/nautilus/components/adapter/nautilus-adapter-factory-server.h
U third/nautilus/components/adapter/nautilus-adapter-file-load-strategy.c
U third/nautilus/components/adapter/nautilus-adapter-file-load-strategy.h
U third/nautilus/components/adapter/nautilus-adapter-load-strategy.c
U third/nautilus/components/adapter/nautilus-adapter-load-strategy.h
U third/nautilus/components/adapter/nautilus-adapter-stream-load-strategy.c
U third/nautilus/components/adapter/nautilus-adapter-stream-load-strategy.h
U third/nautilus/components/adapter/nautilus-zoomable-proxy.c
U third/nautilus/components/adapter/nautilus-zoomable-proxy.h
U third/nautilus/components/adapter/nautilus-adapter.c
U third/nautilus/components/adapter/nautilus-adapter.h
U third/nautilus/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in
U third/nautilus/components/history/Makefile.in
U third/nautilus/components/history/Makefile.am
U third/nautilus/components/history/libmain.c
U third/nautilus/components/history/nautilus-history-view.c
U third/nautilus/components/history/nautilus-history-view.h
U third/nautilus/components/history/Nautilus_View_history.server.in.in
U third/nautilus/components/notes/Makefile.in
U third/nautilus/components/notes/Makefile.am
U third/nautilus/components/notes/nautilus-notes.c
U third/nautilus/components/notes/Nautilus_View_notes.server.in.in
U third/nautilus/components/text/Makefile.in
U third/nautilus/components/text/Makefile.am
U third/nautilus/components/text/nautilus-text-view.c
U third/nautilus/components/text/Nautilus_View_text.server.in.in
U third/nautilus/components/text/nautilus-text-view-ui.xml
U third/nautilus/components/throbber/Makefile.in
U third/nautilus/components/throbber/Makefile.am
U third/nautilus/components/throbber/nautilus-throbber.c
U third/nautilus/components/throbber/nautilus-throbber.h
U third/nautilus/components/throbber/main.c
U third/nautilus/components/throbber/Nautilus_Control_throbber.server.in.in
U third/nautilus/components/emblem/Makefile.in
U third/nautilus/components/emblem/Makefile.am
U third/nautilus/components/emblem/nautilus-emblem-view.c
U third/nautilus/components/emblem/nautilus-emblem-view.h
U third/nautilus/components/emblem/nautilus-emblem-view-iids.h
U third/nautilus/components/emblem/libmain.c
U third/nautilus/components/emblem/Nautilus_View_emblem.server.in.in
U third/nautilus/components/image_properties/Makefile.in
U third/nautilus/components/image_properties/Makefile.am
U third/nautilus/components/image_properties/nautilus-image-properties-view.h
U third/nautilus/components/image_properties/nautilus-image-properties-view.c
U third/nautilus/components/image_properties/libmain.c
U third/nautilus/components/image_properties/Nautilus_View_image_properties.server.in.in
U third/nautilus/po/ChangeLog
U third/nautilus/po/Makefile.in.in
U third/nautilus/po/POTFILES.in
U third/nautilus/po/nautilus.pot
U third/nautilus/po/af.po
U third/nautilus/po/am.po
U third/nautilus/po/ar.po
U third/nautilus/po/az.po
U third/nautilus/po/be.po
U third/nautilus/po/bg.po
U third/nautilus/po/bn.po
U third/nautilus/po/bs.po
U third/nautilus/po/ca.po
U third/nautilus/po/cs.po
U third/nautilus/po/cy.po
U third/nautilus/po/da.po
U third/nautilus/po/de.po
U third/nautilus/po/el.po
U third/nautilus/po/en_CA.po
U third/nautilus/po/en_GB.po
U third/nautilus/po/es.po
U third/nautilus/po/et.po
U third/nautilus/po/eu.po
U third/nautilus/po/fa.po
U third/nautilus/po/fi.po
U third/nautilus/po/fr.po
U third/nautilus/po/ga.po
U third/nautilus/po/gl.po
U third/nautilus/po/gu.po
U third/nautilus/po/he.po
U third/nautilus/po/hi.po
U third/nautilus/po/hr.po
U third/nautilus/po/hu.po
U third/nautilus/po/id.po
U third/nautilus/po/is.po
U third/nautilus/po/it.po
U third/nautilus/po/ja.po
U third/nautilus/po/ko.po
U third/nautilus/po/li.po
U third/nautilus/po/lt.po
U third/nautilus/po/lv.po
U third/nautilus/po/mi.po
U third/nautilus/po/mk.po
U third/nautilus/po/ml.po
U third/nautilus/po/mn.po
U third/nautilus/po/ms.po
U third/nautilus/po/nb.po
U third/nautilus/po/ne.po
U third/nautilus/po/nl.po
U third/nautilus/po/nn.po
U third/nautilus/po/no.po
U third/nautilus/po/pa.po
U third/nautilus/po/pl.po
U third/nautilus/po/pt.po
U third/nautilus/po/pt_BR.po
U third/nautilus/po/ro.po
U third/nautilus/po/ru.po
U third/nautilus/po/sk.po
U third/nautilus/po/sl.po
U third/nautilus/po/sq.po
U third/nautilus/po/sr.po
U third/nautilus/po/sr@Latn.po
U third/nautilus/po/sr@ije.po
U third/nautilus/po/sv.po
U third/nautilus/po/ta.po
U third/nautilus/po/th.po
U third/nautilus/po/tk.po
U third/nautilus/po/tr.po
U third/nautilus/po/uk.po
U third/nautilus/po/vi.po
U third/nautilus/po/wa.po
U third/nautilus/po/yi.po
U third/nautilus/po/zh_CN.po
U third/nautilus/po/zh_TW.po
U third/nautilus/po/af.gmo
U third/nautilus/po/am.gmo
U third/nautilus/po/ar.gmo
U third/nautilus/po/az.gmo
U third/nautilus/po/be.gmo
U third/nautilus/po/bg.gmo
U third/nautilus/po/bn.gmo
U third/nautilus/po/bs.gmo
U third/nautilus/po/ca.gmo
U third/nautilus/po/cs.gmo
U third/nautilus/po/cy.gmo
U third/nautilus/po/da.gmo
U third/nautilus/po/de.gmo
U third/nautilus/po/el.gmo
U third/nautilus/po/en_CA.gmo
U third/nautilus/po/en_GB.gmo
U third/nautilus/po/es.gmo
U third/nautilus/po/et.gmo
U third/nautilus/po/eu.gmo
U third/nautilus/po/fa.gmo
U third/nautilus/po/fi.gmo
U third/nautilus/po/fr.gmo
U third/nautilus/po/ga.gmo
U third/nautilus/po/gl.gmo
U third/nautilus/po/gu.gmo
U third/nautilus/po/he.gmo
U third/nautilus/po/hi.gmo
U third/nautilus/po/hr.gmo
U third/nautilus/po/hu.gmo
U third/nautilus/po/id.gmo
U third/nautilus/po/is.gmo
U third/nautilus/po/it.gmo
U third/nautilus/po/ja.gmo
U third/nautilus/po/ko.gmo
U third/nautilus/po/li.gmo
U third/nautilus/po/lt.gmo
U third/nautilus/po/lv.gmo
U third/nautilus/po/mi.gmo
U third/nautilus/po/mk.gmo
U third/nautilus/po/ml.gmo
U third/nautilus/po/mn.gmo
U third/nautilus/po/ms.gmo
U third/nautilus/po/nb.gmo
U third/nautilus/po/ne.gmo
U third/nautilus/po/nl.gmo
U third/nautilus/po/nn.gmo
U third/nautilus/po/no.gmo
U third/nautilus/po/pa.gmo
U third/nautilus/po/pl.gmo
U third/nautilus/po/pt.gmo
U third/nautilus/po/pt_BR.gmo
U third/nautilus/po/ro.gmo
U third/nautilus/po/ru.gmo
U third/nautilus/po/sk.gmo
U third/nautilus/po/sl.gmo
U third/nautilus/po/sq.gmo
U third/nautilus/po/sr.gmo
U third/nautilus/po/sr@Latn.gmo
U third/nautilus/po/sr@ije.gmo
U third/nautilus/po/sv.gmo
U third/nautilus/po/ta.gmo
U third/nautilus/po/th.gmo
U third/nautilus/po/tk.gmo
U third/nautilus/po/tr.gmo
U third/nautilus/po/uk.gmo
U third/nautilus/po/vi.gmo
U third/nautilus/po/wa.gmo
U third/nautilus/po/yi.gmo
U third/nautilus/po/zh_CN.gmo
U third/nautilus/po/zh_TW.gmo
U third/nautilus/data/Makefile.in
U third/nautilus/data/Makefile.am
U third/nautilus/data/browser.xml
U third/nautilus/data/static_bookmarks.xml
U third/nautilus/data/nautilus-extras.placeholder
U third/nautilus/data/nautilus-suggested.placeholder
U third/nautilus/data/patterns/Makefile.in
U third/nautilus/data/patterns/Makefile.am
U third/nautilus/data/patterns/.striated.png
U third/nautilus/data/patterns/blue_gray_rough.png
U third/nautilus/data/patterns/blue_ridge.png
U third/nautilus/data/patterns/blue_type.png
U third/nautilus/data/patterns/brushed_metal.png
U third/nautilus/data/patterns/burlap.jpg
U third/nautilus/data/patterns/camouflage.png
U third/nautilus/data/patterns/chalk.jpg
U third/nautilus/data/patterns/cork.png
U third/nautilus/data/patterns/countertop.png
U third/nautilus/data/patterns/dark-gnome.jpg
U third/nautilus/data/patterns/dots.png
U third/nautilus/data/patterns/fibers.png
U third/nautilus/data/patterns/fleur_de_lis.png
U third/nautilus/data/patterns/floral.png
U third/nautilus/data/patterns/fossil.png
U third/nautilus/data/patterns/gnome.jpg
U third/nautilus/data/patterns/green_weave.png
U third/nautilus/data/patterns/ice.png
U third/nautilus/data/patterns/manila_paper.png
U third/nautilus/data/patterns/moss_ridge.png
U third/nautilus/data/patterns/numbers.png
U third/nautilus/data/patterns/ocean_stripes.png
U third/nautilus/data/patterns/purple_marble.png
U third/nautilus/data/patterns/reset.png
U third/nautilus/data/patterns/ridged_paper.png
U third/nautilus/data/patterns/rough_paper.png
U third/nautilus/data/patterns/sky_ridge.png
U third/nautilus/data/patterns/snow_ridge.png
U third/nautilus/data/patterns/stucco.jpg
U third/nautilus/data/patterns/terracotta.png
U third/nautilus/data/patterns/wavy_white.png
U third/nautilus/icons/Makefile.in
U third/nautilus/icons/Makefile.am
U third/nautilus/icons/Search.png
U third/nautilus/icons/audio.png
U third/nautilus/icons/backgrounds.png
U third/nautilus/icons/chit_frame.png
U third/nautilus/icons/colors.png
U third/nautilus/icons/emblems.png
U third/nautilus/icons/knob.png
U third/nautilus/icons/nautilus-desktop.png
U third/nautilus/icons/nautilus-launch-icon.png
U third/nautilus/icons/nautilus-mini-logo.png
U third/nautilus/icons/nautilus-server-connect.png
U third/nautilus/icons/nautilus-file-management-properties.png
U third/nautilus/icons/note-indicator.png
U third/nautilus/icons/side_bar_image.png
U third/nautilus/icons/text-selection-frame.png
U third/nautilus/icons/thumbnail_frame.png
U third/nautilus/icons/erase.png
U third/nautilus/icons/crux_eggplant/Makefile.in
U third/nautilus/icons/crux_eggplant/Makefile.am
U third/nautilus/icons/crux_eggplant/crux_eggplant.xml
U third/nautilus/icons/crux_eggplant/Search.png
U third/nautilus/icons/crux_teal/Makefile.in
U third/nautilus/icons/crux_teal/Makefile.am
U third/nautilus/icons/crux_teal/crux_teal.xml
U third/nautilus/icons/crux_teal/Search.png
U third/nautilus/icons/default/Makefile.in
U third/nautilus/icons/default/Makefile.am
U third/nautilus/icons/default/Search.png
U third/nautilus/icons/default/default.xml
U third/nautilus/icons/default/side_bar_image.png
U third/nautilus/icons/gnome/Makefile.in
U third/nautilus/icons/gnome/Makefile.am
U third/nautilus/icons/gnome/gnome.xml
U third/nautilus/icons/gnome/Services.png
U third/nautilus/icons/sierra/Makefile.in
U third/nautilus/icons/sierra/Makefile.am
U third/nautilus/icons/sierra/green_weave.png
U third/nautilus/icons/sierra/sierra.xml
U third/nautilus/icons/tahoe/Makefile.in
U third/nautilus/icons/tahoe/Makefile.am
U third/nautilus/icons/tahoe/tahoe.xml
U third/nautilus/icons/tahoe/bluewall.png
U third/nautilus/docs/Makefile.in
U third/nautilus/docs/Makefile.am
U third/nautilus/docs/architecture.txt
U third/nautilus/docs/dnd.txt
U third/nautilus/docs/load-states.dia
U third/nautilus/docs/nautilus-context-menus.txt
U third/nautilus/docs/nautilus-internals.sxw
U third/nautilus/docs/nautilus-internals.pdf
U third/nautilus/docs/nautilus-io.txt
U third/nautilus/docs/nautilus.faq
U third/nautilus/docs/recommended-books.html
U third/nautilus/docs/smoketests.html
U third/nautilus/docs/state-machines.txt
U third/nautilus/docs/style-guide.html
U third/nautilus/docs/key_mouse_navigation.txt
4 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jvendor:yesterday -jvendor third/nautilus
