diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
| commit | 729ffbae086309992d7433a296fca64f6800f8fa (patch) | |
| tree | 6c133d2b91ab9313da11bf8bad15f497e1b5c61f /source3/m4/aclocal.m4 | |
| parent | 88ad1a936ccd2451d6dbf542a0a746ad71a3e968 (diff) | |
| parent | fc7050e54c69919d754ca0adf3f2f741a501fec4 (diff) | |
| download | samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.gz samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.bz2 samba-729ffbae086309992d7433a296fca64f6800f8fa.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Conflicts:
source4/main.mk
Diffstat (limited to 'source3/m4/aclocal.m4')
| -rw-r--r-- | source3/m4/aclocal.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4 index 9a4213d976..aae729c825 100644 --- a/source3/m4/aclocal.m4 +++ b/source3/m4/aclocal.m4 @@ -886,4 +886,4 @@ int main(void) ]) ]) -m4_include(lib/replace/libreplace.m4) +m4_include(../lib/replace/libreplace.m4) |