diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-02 04:15:11 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-02 04:15:11 +0100 |
commit | 2d7a3748b2063c4137ee98ceca85361651ef8ee7 (patch) | |
tree | 2fd585a487b3d4af7056022bbf02c61910fe92c6 /source3/Makefile.in | |
parent | c7b9757b8ac3ac6baa478655a4d2f77dff8240a8 (diff) | |
parent | 9b0df441e1bd836c433e11582650fa0171791485 (diff) | |
download | samba-2d7a3748b2063c4137ee98ceca85361651ef8ee7.tar.gz samba-2d7a3748b2063c4137ee98ceca85361651ef8ee7.tar.bz2 samba-2d7a3748b2063c4137ee98ceca85361651ef8ee7.zip |
Merge branch 'master' of git://git.samba.org/samba into convenience
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index abf6cfb5f7..28b5437838 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -672,8 +672,8 @@ VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o VFS_ONEFS_OBJ = modules/vfs_onefs.o modules/onefs_acl.o modules/onefs_system.o \ - modules/onefs_open.o modules/onefs_streams.o modules/onefs_dir.c \ - modules/onefs_cbrl.o modules/onefs_notify.o + modules/onefs_open.o modules/onefs_streams.o modules/onefs_dir.o \ + modules/onefs_cbrl.o modules/onefs_notify.o modules/onefs_config.o VFS_ONEFS_SHADOW_COPY_OBJ = modules/vfs_onefs_shadow_copy.o modules/onefs_shadow_copy.o PERFCOUNT_ONEFS_OBJ = modules/perfcount_onefs.o PERFCOUNT_TEST_OBJ = modules/perfcount_test.o |