]> granicus.if.org Git - zfs/commitdiff
projects / zfs / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5ba75f 3700f9d)
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 22:51:51 +0000 (15:51 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 22:51:51 +0000 (15:51 -0700)
1  2 
lib/libzfs/libzfs_dataset.c patch | diff1 | diff2 | blob | history
lib/libzfs/libzfs_sendrecv.c patch | diff1 | diff2 | blob | history

diff --cc lib/libzfs/libzfs_dataset.c
Simple merge
diff --cc lib/libzfs/libzfs_sendrecv.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.