Conflicts:
.gitignore
libclamav/c++/clamavcxx-config.h.in
... | ... |
@@ -1,33 +1,69 @@ |
1 |
+*.[oa] |
|
2 |
+*.gcda |
|
3 |
+*.gcno |
|
4 |
+*.l[oa] |
|
5 |
+*.swp |
|
1 | 6 |
*~ |
7 |
+.deps |
|
8 |
+.libs |
|
9 |
+/target.h |
|
10 |
+Makefile |
|
11 |
+Makefile.in |
|
12 |
+TAGS |
|
13 |
+aclocal.m4 |
|
2 | 14 |
autom4te.cache/* |
3 |
-clamav-config |
|
4 | 15 |
clamav-config.h |
16 |
+clamav-config.h.in |
|
17 |
+clamav-milter/Makefile.in |
|
18 |
+clambc/Makefile.in |
|
19 |
+clamconf/Makefile.in |
|
20 |
+clamconf/Makefile.in |
|
21 |
+clamd/Makefile.in |
|
22 |
+clamdscan/Makefile.in |
|
23 |
+clamdtop/Makefile.in |
|
24 |
+clammem/Makefile.in |
|
25 |
+clamscan/Makefile.in |
|
26 |
+clamscan/Makefile.in |
|
5 | 27 |
config.log |
6 | 28 |
config.status |
7 |
-.deps |
|
8 |
-*.gcda |
|
9 |
-*.gcno |
|
29 |
+config/ar-lib |
|
30 |
+config/compile |
|
31 |
+config/config.guess |
|
32 |
+config/config.sub |
|
33 |
+config/depcomp |
|
34 |
+config/install-sh |
|
35 |
+config/ltmain.sh |
|
36 |
+config/missing |
|
37 |
+config/test-driver |
|
38 |
+configure |
|
39 |
+contrib/old-clamav-milter/Makefile.in |
|
40 |
+database/Makefile.in |
|
41 |
+docs/Makefile.in |
|
42 |
+etc/Makefile.in |
|
43 |
+etc/Makefile.in |
|
44 |
+freshclam/Makefile.in |
|
10 | 45 |
libclamav.pc |
11 |
-.libs |
|
12 |
-libtool |
|
13 |
-*.l[oa] |
|
14 |
-Makefile |
|
15 |
-*.[oa] |
|
16 |
-platform.h |
|
17 |
-stamp-h1 |
|
18 |
-*.swp |
|
19 |
-TAGS |
|
20 |
-/target.h |
|
21 |
-libclamav/c++/autom4te.cache/* |
|
46 |
+libclamav/Makefile.in |
|
22 | 47 |
libclamav/c++/FileCheck |
23 |
-libclamav/c++/count |
|
48 |
+libclamav/c++/Makefile.in |
|
49 |
+libclamav/c++/aclocal.m4 |
|
50 |
+libclamav/c++/autom4te.cache/* |
|
24 | 51 |
libclamav/c++/clamavcxx-config.h |
52 |
+libclamav/c++/clamavcxx-config.h.in |
|
53 |
+libclamav/c++/config/config.guess |
|
54 |
+libclamav/c++/config/config.sub |
|
55 |
+libclamav/c++/config/depcomp |
|
56 |
+libclamav/c++/config/install-sh |
|
57 |
+libclamav/c++/config/ltmain.sh |
|
58 |
+libclamav/c++/config/missing |
|
59 |
+libclamav/c++/configure |
|
60 |
+libclamav/c++/count |
|
25 | 61 |
libclamav/c++/llc |
26 | 62 |
libclamav/c++/lli |
27 | 63 |
libclamav/c++/llvm-as |
28 | 64 |
libclamav/c++/llvm-dis |
29 |
-libclamav/c++/llvm/Makefile.config |
|
30 | 65 |
libclamav/c++/llvm/Debug/ |
66 |
+libclamav/c++/llvm/Makefile.config |
|
31 | 67 |
libclamav/c++/llvm/Release |
32 | 68 |
libclamav/c++/llvm/docs/doxygen.cfg |
33 | 69 |
libclamav/c++/llvm/include/llvm/Config/*.def |
... | ... |
@@ -35,73 +71,39 @@ libclamav/c++/llvm/include/llvm/Config/config.h |
35 | 35 |
libclamav/c++/llvm/include/llvm/System/DataTypes.h |
36 | 36 |
libclamav/c++/llvm/llvm.spec |
37 | 37 |
libclamav/c++/llvm/mklib |
38 |
-libclamav/c++/llvm/test/*/Output |
|
39 |
-libclamav/c++/llvm/test/*/.dir |
|
40 |
-libclamav/c++/llvm/test/*/*/Output |
|
41 | 38 |
libclamav/c++/llvm/test/*/*/*/Output |
42 |
-libclamav/c++/llvm/test/lit.site.cfg |
|
39 |
+libclamav/c++/llvm/test/*/*/Output |
|
40 |
+libclamav/c++/llvm/test/*/.dir |
|
41 |
+libclamav/c++/llvm/test/*/Output |
|
43 | 42 |
libclamav/c++/llvm/test/Unit/lit.site.cfg |
43 |
+libclamav/c++/llvm/test/lit.site.cfg |
|
44 | 44 |
libclamav/c++/llvm/test/site.exp |
45 | 45 |
libclamav/c++/llvm/tools/llvm-config/llvm-config.in |
46 |
+libclamav/c++/llvm/tools/llvmc/plugins/Base/Base.td |
|
46 | 47 |
libclamav/c++/llvm/utils/lit/*.pyc |
47 | 48 |
libclamav/c++/llvmunittest_ADT |
48 | 49 |
libclamav/c++/llvmunittest_ExecutionEngine |
49 | 50 |
libclamav/c++/llvmunittest_JIT |
50 | 51 |
libclamav/c++/llvmunittest_Support |
51 | 52 |
libclamav/c++/llvmunittest_VMCore |
53 |
+libclamav/c++/m4/libtool.m4 |
|
52 | 54 |
libclamav/c++/not |
53 | 55 |
libclamav/c++/tblgen |
54 |
-libclamav/c++/llvm/tools/llvmc/plugins/Base/Base.td |
|
55 |
-clamdtop/Makefile.in |
|
56 |
-docs/Makefile.in |
|
57 |
-etc/Makefile.in |
|
58 |
-sigtool/Makefile.in |
|
59 |
-clamscan/Makefile.in |
|
60 |
-unit_tests/Makefile.in |
|
61 |
-shared/Makefile.in |
|
62 |
-contrib/old-clamav-milter/Makefile.in |
|
63 |
-freshclam/Makefile.in |
|
64 |
-Makefile.in |
|
65 | 56 |
libclamunrar_iface/Makefile.in |
66 |
-test/Makefile.in |
|
67 |
-libltdl/Makefile.in |
|
68 |
-clambc/Makefile.in |
|
69 |
-clamconf/Makefile.in |
|
70 |
-clamdscan/Makefile.in |
|
71 |
-clamav-milter/Makefile.in |
|
72 |
-clamd/Makefile.in |
|
73 |
-libclamav/c++/Makefile.in |
|
74 |
-libclamav/Makefile.in |
|
75 |
-database/Makefile.in |
|
76 |
-clamav-config.h.in |
|
77 | 57 |
libclamunrar_iface/Makefile.in |
78 |
-etc/Makefile.in |
|
79 |
-configure |
|
80 |
-config/ar-lib |
|
81 |
-config/compile |
|
82 |
-config/test-driver |
|
58 |
+libltdl/Makefile.am |
|
59 |
+libltdl/Makefile.in |
|
83 | 60 |
libltdl/argz.h |
84 | 61 |
libltdl/autom4te.cache |
85 |
-libltdl/config.h |
|
86 | 62 |
libltdl/config |
63 |
+libltdl/config.h |
|
87 | 64 |
libltdl/m4 |
88 |
-clammem/Makefile.in |
|
89 |
-aclocal.m4 |
|
90 |
-config/config.guess |
|
91 |
-config/config.sub |
|
92 |
-config/depcomp |
|
93 |
-config/install-sh |
|
94 |
-config/ltmain.sh |
|
95 |
-config/missing |
|
96 |
-libclamav/c++/aclocal.m4 |
|
97 |
-libclamav/c++/config/config.guess |
|
98 |
-libclamav/c++/config/config.sub |
|
99 |
-libclamav/c++/config/depcomp |
|
100 |
-libclamav/c++/config/install-sh |
|
101 |
-libclamav/c++/config/ltmain.sh |
|
102 |
-libclamav/c++/config/missing |
|
103 |
-libclamav/c++/configure |
|
104 |
-libclamav/c++/m4/libtool.m4 |
|
105 |
-libltdl/Makefile.am |
|
65 |
+libtool |
|
106 | 66 |
m4/libtool.m4 |
107 | 67 |
m4/ltdl.m4 |
68 |
+platform.h |
|
69 |
+shared/Makefile.in |
|
70 |
+sigtool/Makefile.in |
|
71 |
+stamp-h1 |
|
72 |
+test/Makefile.in |
|
73 |
+unit_tests/Makefile.in |