diff options
| author | Nils Gillmann <ng0@n0.is> | 2018-06-13 08:05:15 +0000 |
|---|---|---|
| committer | Nils Gillmann <ng0@n0.is> | 2018-06-13 08:05:15 +0000 |
| commit | 5c7f4f919d2569f49e4223d77000452dd2ec4e97 (patch) | |
| tree | 8cec76a5dda6b034d1e5b85eee76a43fafd8a4a5 /contrib/Makefile.am | |
| parent | 1f7a2dd68d1e6260fad4af042878c0a07d39bc12 (diff) | |
| parent | 8503c6fa26449228fa691c1dedfe3ca1a8d0b9ba (diff) | |
| download | gnunet-5c7f4f919d2569f49e4223d77000452dd2ec4e97.tar.gz gnunet-5c7f4f919d2569f49e4223d77000452dd2ec4e97.zip | |
Merge branch 'master' of gnunet.org:gnunet
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'contrib/Makefile.am')
| -rw-r--r-- | contrib/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 81528a90e..a3cc081b7 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am | |||
| @@ -63,9 +63,8 @@ EXTRA_DIST = \ | |||
| 63 | scripts/gnunet-chk.py.in \ | 63 | scripts/gnunet-chk.py.in \ |
| 64 | scripts/removetrailingwhitespace.py.in \ | 64 | scripts/removetrailingwhitespace.py.in \ |
| 65 | scripts/pydiffer.py.in \ | 65 | scripts/pydiffer.py.in \ |
| 66 | scripts/gnunet-gns-import.sh \ | ||
| 67 | packages/nix/default.nix \ | 66 | packages/nix/default.nix \ |
| 68 | packages/nix/gnunet-dex.nix \ | 67 | packages/nix/gnunet-dev.nix \ |
| 69 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \ | 68 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \ |
| 70 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat \ | 69 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat \ |
| 71 | 3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf \ | 70 | 3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf \ |