diff options
| author | Juergen Daubert <jue@jue.li> | 2014-06-05 13:15:39 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2014-06-05 13:15:39 +0200 |
| commit | c52ef1a61e361d76c97d2530e6e0024569b483d3 (patch) | |
| tree | 2b830de87cd830e6a07acab2977b755d76063381 /samba/.footprint | |
| parent | 4b0edbd1a9dcb2c74574f8d68b5045e6805fa2ba (diff) | |
| parent | 60d37e9efa808e2d381b1a5a8739a2c20f8160c0 (diff) | |
| download | opt-c52ef1a61e361d76c97d2530e6e0024569b483d3.tar.gz opt-c52ef1a61e361d76c97d2530e6e0024569b483d3.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, 0 insertions, 2 deletions
diff --git a/samba/.footprint b/samba/.footprint index f18783288..f98e3c20c 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -281,8 +281,6 @@ 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 |