Erik Larsson
|
bcdc76f12d
|
Merge remote branch 'linux-ntfs/libntfs-3g_port-v2_0_0' into PERMISSION_HANDLING_BRANCH
Conflicts:
.cvsignore
AUTHORS
CREDITS
ChangeLog
NEWS
README
TODO.libntfs
autogen.sh
configure.ac
include/ntfs/Makefile.am
libntfs-3g/misc.c
libntfs/Makefile.am
libntfs/gnome-vfs-method.c
libntfs/gnome-vfs-module.c
ntfsprogs.spec.in
ntfsprogs/.cvsignore
ntfsprogs/mkntfs.c
ntfsprogs/ntfscat.8.in
ntfsprogs/ntfsclone.c
ntfsprogs/ntfscp.8.in
ntfsprogs/ntfsinfo.c
ntfsprogs/ntfsprogs.8.in
ntfsprogs/ntfsresize.c
ntfsprogs/ntfsrm.c
ntfsprogs/ntfsundelete.h
ntfsprogs/upcase.c
ntfsprogs/utils.c
test/Makefile.am
|
2010-12-17 09:04:01 +01:00 |