[nautilus/f14/master: 2/2] merge
Matthias Clasen
mclasen at fedoraproject.org
Wed Sep 29 11:30:23 UTC 2010
commit a94f4afbea0889a0d6307297aa4c81d0e8927312
Merge: 1e0669f ed44121
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Sep 29 07:29:26 2010 -0400
merge
.gitignore | 6 +
0001-Update-pkg-config-files-for-GTK-3.x.patch | 37 -
...ld-link-against-gail-3.0-GNOME-bug-622155.patch | 42 -
0013-eel-GSEAL-eel-accessibility.patch | 25 -
0014-eel-GSEAL-eel-alert-dialog.patch | 43 -
0015-eel-GSEAL-eel-art-gtk-extensions.patch | 53 --
0016-eel-GSEAL-eel-background-box.patch | 25 -
0017-eel-GSEAL-eel-background-box.patch | 143 ----
0018-eel-GSEAL-eel-canvas-rect-ellipse.patch | 37 -
0019-eel-GSEAL-eel-canvas.patch | 815 --------------------
0020-eel-GSEAL-eel-debug-drawing.patch | 72 --
0021-eel-GSEAL-eel-editable-label.patch | 578 --------------
0022-eel-GSEAL-eel-gtk-container.patch | 52 --
0023-eel-GSEAL-eel-gtk-extensions.patch | 209 -----
0024-eel-GSEAL-eel-image-table.patch | 25 -
0025-eel-GSEAL-eel-labeled-image.patch | 178 -----
0026-eel-GSEAL-eel-wrap-table.patch | 136 ----
0027-ln-p-GSEAL-nautilus-autorun.patch | 34 -
0028-ln-p-GSEAL-nautilus-bookmark.patch | 25 -
...SEAL-nautilus-cell-renderer-pixbuf-emblem.patch | 117 ---
0030-ln-p-GSEAL-nautilus-clipboard-monitor.patch | 49 --
0031-ln-p-GSEAL-nautilus-clipboard.patch | 40 -
0032-ln-p-GSEAL-nautilus-dnd.patch | 197 -----
0033-ln-p-GSEAL-nautilus-entry.patch | 34 -
...-ln-p-GSEAL-nautilus-file-conflict-dialog.patch | 25 -
0035-ln-p-GSEAL-nautilus-file-operations.patch | 25 -
0036-ln-p-GSEAL-nautilus-horizontal-splitter.patch | 87 ---
0037-ln-p-GSEAL-nautilus-icon-canvas-item.patch | 85 --
0038-ln-p-GSEAL-nautilus-icon-container.patch | 732 ------------------
0039-ln-p-GSEAL-nautilus-icon-dnd.patch | 362 ---------
...n-p-GSEAL-nautilus-keep-last-vertical-box.patch | 33 -
0041-ln-p-GSEAL-nautilus-open-with-dialog.patch | 43 -
0042-ln-p-GSEAL-nautilus-progress-info.patch | 25 -
0043-ln-p-GSEAL-nautilus-tree-view-drag-dest.patch | 199 -----
0044-ln-p-GSEAL-nautilus-undo.patch | 34 -
0045-file-manager-GSEAL-fm-desktop-icon-view.patch | 57 --
0046-file-manager-GSEAL-fm-directory-view.patch | 123 ---
0047-file-manager-GSEAL-fm-ditem-page.patch | 34 -
0048-file-manager-GSEAL-fm-icon-view.patch | 43 -
0049-file-manager-GSEAL-fm-list-model.patch | 25 -
0050-file-manager-GSEAL-fm-list-view.patch | 148 ----
0051-file-manager-GSEAL-fm-properties-window.patch | 285 -------
0052-file-manager-GSEAL-fm-tree-view.patch | 36 -
0053-src-GSEAL-nautilus-application.patch | 58 --
...-src-GSEAL-nautilus-connect-server-dialog.patch | 113 ---
0055-src-GSEAL-nautilus-desktop-window.patch | 37 -
0056-src-GSEAL-nautilus-emblem-sidebar.patch | 133 ----
0057-src-GSEAL-nautilus-information-panel.patch | 90 ---
0058-src-GSEAL-nautilus-location-bar.patch | 67 --
0059-src-GSEAL-nautilus-location-dialog.patch | 34 -
...rc-GSEAL-nautilus-navigation-window-menus.patch | 25 -
0061-src-GSEAL-nautilus-navigation-window.patch | 28 -
0062-src-GSEAL-nautilus-notebook.patch | 58 --
0063-src-GSEAL-nautilus-pathbar.patch | 237 ------
0064-src-GSEAL-nautilus-places-sidebar.patch | 64 --
0065-src-GSEAL-nautilus-property-browser.patch | 138 ----
0066-src-GSEAL-nautilus-query-editor.patch | 25 -
0067-src-GSEAL-nautilus-side-pane.patch | 59 --
0068-src-GSEAL-nautilus-sidebar-title.patch | 88 ---
0069-src-GSEAL-nautilus-spatial-window.patch | 48 --
0070-src-GSEAL-nautilus-window-bookmarks.patch | 25 -
0071-src-GSEAL-nautilus-window-manage-views.patch | 25 -
0072-src-GSEAL-nautilus-window.patch | 29 -
0073-src-GSEAL-nautilus-zoom-control.patch | 112 ---
0074-test-GSEAL-test-eel-image-table.patch | 35 -
nautilus-2.30.1-hide-unmount-when-eject.patch | 92 ---
...-selinux.patch => nautilus-2.31.6-selinux.patch | 167 ++---
nautilus-2.31.x-seal-GtkBoxChild.patch | 107 ---
nautilus-2.31.x-seal1.patch | 489 ------------
nautilus-2.5.7-rhconfig.patch | 11 -
nautilus-578086-po.patch | 47 +--
nautilus-gconf-correct-type.patch | 22 -
nautilus-gconf-default-value.patch | 27 -
...us-gconf-navigation_window_saved_geometry.patch | 34 -
...s-gconf-navigation_window_saved_maximized.patch | 33 -
nautilus.spec | 33 +-
76 files changed, 113 insertions(+), 7850 deletions(-)
---
diff --cc .gitignore
index d4c1846,b1d78c4..67077ea
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,8 @@@
nautilus-2.31.5.tar.bz2
++<<<<<<< HEAD
+/nautilus-2.32.0.tar.bz2
++=======
+ nautilus-2.31.6.tar.bz2
+ /nautilus-2.31.90.tar.bz2
+ /nautilus-2.31.92.tar.bz2
++>>>>>>> ed44121ad8417188d398eb8cc9848d41e8da3d82
diff --cc nautilus.spec
index 4db88c2,40399e6..205b201
--- a/nautilus.spec
+++ b/nautilus.spec
@@@ -256,9 -268,17 +268,20 @@@ gtk-update-icon-cache %{_datadir}/icons
%changelog
+* Wed Sep 29 2010 Matthias Clasen <mclasen at redhat.com> - 2.32.0-1
+- Update to 2.32.0
- - Drop ~150 patches
++
+ * Mon Sep 13 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.31.92-1
+ - Update to 2.31.92
+
+ * Tue Sep 7 2010 Dan Horák <dan[at]danny.cz> - 2.31.90-2
+ - refresh the files in ./po after touching POTFILES.in
+
+ * Wed Aug 18 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.31.90-1
+ - Update to 2.31.90
+
+ * Thu Aug 12 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.31.6-1
+ - Update to 2.31.6
* Fri Aug 6 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.31.5-3.really.2.30.1
- Revert back (temporarily) to 2.30.1 and mask it as 2.31.5 due to recent gnome3 changes
More information about the scm-commits
mailing list