From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 4 Jun 2015 19:20:15 +0200
Subject: ics-openvpn as a submodule! beautiful

ics-openvpn is now officially on GitHub, and they track openssl and
openvpn as submodules, so it's easier to update everything. Just a git
submodule update --recursive.

I've also set up soft links to native modules from ics-openvpn in app,
so that we don't copy files in Gradle (which was causing problems with
the submodules .git* files, not being copied). That makes the repo
cleaner.
---
 app/lzo/asm/i386/src_gas/asminit.def | 67 ------------------------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 app/lzo/asm/i386/src_gas/asminit.def

(limited to 'app/lzo/asm/i386/src_gas/asminit.def')

diff --git a/app/lzo/asm/i386/src_gas/asminit.def b/app/lzo/asm/i386/src_gas/asminit.def
deleted file mode 100644
index 1115582f..00000000
--- a/app/lzo/asm/i386/src_gas/asminit.def
+++ /dev/null
@@ -1,67 +0,0 @@
-/* asminit.def --
-
-   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/
- */
-
-#if (defined(__MACH__) && defined(__APPLE__))
-#  define NAME1(x)      _ ## x
-#else
-#  define NAME1(x)      _ ## x
-#  define NAME2(x)           x
-#endif
-
-#ifndef p2align
-#  define p2align(x)    .p2align x
-#endif
-#ifndef globalf
-#  define globalf(x)    .globl x
-#endif
-#ifndef typef
-#  if defined(__ELF__)
-#    define typef(x)    .type x,@function
-#  else
-#    define typef(x)
-#  endif
-#endif
-#ifndef sizef
-#  if defined(__ELF__)
-#    define sizef(x,s)  .size x,s
-#  else
-#    define sizef(x,s)
-#  endif
-#endif
-
-#if defined(__ELF__)
-.section .note.GNU-stack,"",@progbits
-#endif
-.text
-#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__)
-p2align(6)
-#else
-p2align(4)
-#endif
-#ifndef db
-#  define db            .byte
-#endif
-- 
cgit v1.2.3

