Merge branch 'research/Test-on-Android-5-#6543' into develop

1 files changed, 0 insertions, 40 deletions

diff --git a/ics-openvpn-stripped/main/lzo/src/lzo1_cm.ch b/ics-openvpn-stripped/main/lzo/src/lzo1_cm.ch
deleted file mode 100644
index 9e6ee32f..00000000
--- a/ics-openvpn-stripped/main/lzo/src/lzo1_cm.ch
+++ /dev/null
@@ -1,40 +0,0 @@
-/* lzo1_cm.ch -- implementation of the LZO1 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#include "lzo1a_cm.ch"
-
-
-/*
-vi:ts=4:et
-*/