Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gnome-vfs-11-zfs-trash.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 11543 7a249c93e0ab
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11154
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
     1
 
--- gnome-vfs-2.20.0-orig/libgnomevfs/gnome-vfs-filesystem-type.c	2007-09-17 18:00:46.000000000 +0100
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
     2
 
+++ gnome-vfs-2.20.0-migi/libgnomevfs/gnome-vfs-filesystem-type.c	2007-11-08 16:54:57.983327965 +0000
11543
7a249c93e0ab 2008-01-29 Takao Fujiwara <[email protected]>
fujiwara
parents: 11154
diff changeset 
     3
 
@@ -85,6 +85,8 @@
11154
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
     4
 
 	{ "xfs"      , N_("XFS Linux Volume"), 1 },
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
     5
 
 	{ "xiafs"    , N_("XIAFS Volume"), 0 },
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
     6
 
 	{ "cifs"     , N_("CIFS Volume"), 1 },
11543
7a249c93e0ab 2008-01-29 Takao Fujiwara <[email protected]>
fujiwara
parents: 11154
diff changeset 
     7
 
+	/* SUN_BRANDING */
11154
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
     8
 
+        { "zfs"     , N_("ZFS Volume"), 1 },
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
     9
 
 };
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    10
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    11
 
 static struct FSInfo *
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    12
 
--- gnome-vfs-2.20.0-orig/libgnomevfs/gnome-vfs-volume.c	2007-11-08 16:53:39.848358165 +0000
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    13
 
+++ gnome-vfs-2.20.0-migi/libgnomevfs/gnome-vfs-volume.c	2007-11-08 16:56:01.527169813 +0000
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    14
 
@@ -416,6 +416,7 @@
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    15
 
  *    <row><entry>xfs</entry><entry>XFS Linux Volume</entry><entry>Yes</entry></row>
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    16
 
  *    <row><entry>xiafs</entry><entry>XIAFS Volume</entry><entry>No</entry></row>
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    17
 
  *    <row><entry>cifs</entry><entry>CIFS Volume</entry><entry>Yes</entry></row>
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    18
 
+ *    <row><entry>zfs</entry><entry>ZFS Volume</entry><entry>Yes</entry></row>
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    19
 
  *   </tbody>
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    20
 
  *  </tgroup>
b767caefc343 2007-11-08 Michal Pryc <[email protected]>
migi
parents:
diff changeset 
    21
 
  * </table>
upstream/oracle/spec-files