diff options
| author | Juergen Daubert <jue@jue.li> | 2014-06-25 10:45:09 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2014-06-25 10:45:09 +0200 |
| commit | 1cb79cfc3d0ecfb6fc8e70f76df8edeec220e3dc (patch) | |
| tree | 0e154bdbf0b6f2d3832301c14e6ddb6d765f3dfa /samba/.footprint | |
| parent | a66fdc41f0c7ba7cde3776d0774ffad1cab68c00 (diff) | |
| parent | 8e7b781cfd8b09b4bcdda7c8e19c42e5c7f22166 (diff) | |
| download | opt-1cb79cfc3d0ecfb6fc8e70f76df8edeec220e3dc.tar.gz opt-1cb79cfc3d0ecfb6fc8e70f76df8edeec220e3dc.tar.xz | |
Merge branch '3.0' into 3.1
Conflicts:
samba/.footprint
Diffstat (limited to 'samba/.footprint')
| -rw-r--r-- | samba/.footprint | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/samba/.footprint b/samba/.footprint index f98e3c20c..f18783288 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -281,6 +281,8 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/Parse/Pidl/Samba4/NDR/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/Parse/Pidl/Wireshark/ -rw-r--r-- root/root usr/lib/perl5/site_perl/5.18/Parse/Pidl/Wireshark/Conformance.pm -rw-r--r-- root/root usr/lib/perl5/site_perl/5.18/Parse/Pidl/Wireshark/NDR.pm +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/Parse/Yapp/ +-rw-r--r-- root/root usr/lib/perl5/site_perl/5.18/Parse/Yapp/Driver.pm drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dcerpc.pc -rw-r--r-- root/root usr/lib/pkgconfig/dcerpc_atsvc.pc |