CVSROOT:        /cvs/gnome
Module name:    nautilus
Changes by:     alexl   05/12/12 11:59:19

Modified files:
        .              : .cvsignore ChangeLog configure.in 
        data           : .cvsignore Makefile.am 
        libnautilus-private: Makefile.am nautilus-directory-async.c 
                             nautilus-directory-metafile.c 
                             nautilus-directory-private.h 
                             nautilus-directory.c nautilus-directory.h 
                             nautilus-file-dnd.c nautilus-file-private.h 
                             nautilus-file-utilities.c 
                             nautilus-file-utilities.h nautilus-file.c 
                             nautilus-file.h nautilus-icon-container.c 
                             nautilus-icon-container.h 
                             nautilus-icon-factory.c 
                             nautilus-icon-private.h 
                             nautilus-marshal.list 
                             nautilus-metafile-factory.c 
                             nautilus-metafile.c 
                             nautilus-tree-view-drag-dest.c 
        po             : sk.po sv.po 
        po             : sk.po sv.po 
        src            : Makefile.am nautilus-actions.h 
                         nautilus-history-sidebar.c 
                         nautilus-location-bar.c 
                         nautilus-location-entry.c 
                         nautilus-location-entry.h 
                         nautilus-navigation-window-menus.c 
                         nautilus-navigation-window-ui.xml 
                         nautilus-navigation-window.c 
                         nautilus-navigation-window.h 
                         nautilus-spatial-window-ui.xml 
                         nautilus-spatial-window.c 
                         nautilus-window-manage-views.c 
                         nautilus-window-menus.c 
                         nautilus-window-private.h nautilus-window.c 
                         nautilus-window.h 
        src/file-manager: fm-actions.h fm-directory-view.c 
                          fm-directory-view.h fm-error-reporting.c 
                          fm-error-reporting.h fm-icon-view.c 
                          fm-list-model.c fm-list-model.h fm-list-view.c 
                          fm-properties-window.c 
                          nautilus-directory-view-ui.xml 
        test           : .cvsignore Makefile.am 
Added files:
        data           : nautilus.xml.in 
        icons          : Search.png nautilus-desktop.png 
                         nautilus-file-management-properties.png 
                         nautilus-mini-logo.png 
                         nautilus-server-connect.png side_bar_image.png 
        libnautilus-private: nautilus-query.c nautilus-query.h 
                             nautilus-saved-search-file.c 
                             nautilus-saved-search-file.h 
                             nautilus-search-directory-file.c 
                             nautilus-search-directory-file.h 
                             nautilus-search-directory.c 
                             nautilus-search-directory.h 
                             nautilus-search-engine-beagle.c 
                             nautilus-search-engine-beagle.h 
                             nautilus-search-engine-simple.c 
                             nautilus-search-engine-simple.h 
                             nautilus-search-engine.c 
                             nautilus-search-engine.h 
        src            : nautilus-query-editor.c nautilus-query-editor.h 
                         nautilus-search-bar.c nautilus-search-bar.h 
        test           : test-nautilus-directory-async.c 
                         test-nautilus-search-engine.c 

Log message:
--- Merged the nautilus-search2 branch ---

URL : 
http://cvs.gnome.org/bonsai/cvsquery.cgi?branch=&dir=nautilus&who=alexl&date=explicit&mindate=2005-12-12%2011:58&maxdate=2005-12-12%2012:00

_______________________________________________
cvs-commits-list mailing list
cvs-commits-list@gnome.org
http://mail.gnome.org/mailman/listinfo/cvs-commits-list

Reply via email to