diff options
author | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
commit | 18fef7c99aa36b3e5622b3865f36d78d0879e92d (patch) | |
tree | 7a04fc87318d5008bbc1f1ac145ebb505bb5238c /ics-openvpn-stripped/main/lzo/include/Makefile.am | |
parent | 56fe0400b8983ce57112ed5a0f993985a87741c0 (diff) | |
parent | 33c5958a18599267820f73b151d8161d83f93d88 (diff) |
Merge branch 'research/Test-on-Android-5-#6543' into develop
Diffstat (limited to 'ics-openvpn-stripped/main/lzo/include/Makefile.am')
-rw-r--r-- | ics-openvpn-stripped/main/lzo/include/Makefile.am | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ics-openvpn-stripped/main/lzo/include/Makefile.am b/ics-openvpn-stripped/main/lzo/include/Makefile.am deleted file mode 100644 index 5ad18f48..00000000 --- a/ics-openvpn-stripped/main/lzo/include/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to create Makefile.in -# -# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer -# - -SUBDIRS = lzo |