From e3780a2d7713fa854cd1aec3bdaec03b41d1d0d1 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Wed, 19 Jul 2017 21:38:28 +0200 Subject: [PATCH 1/3] Fix workding problem --- static/results.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/results.tmpl b/static/results.tmpl index 88f2f9499..8ace653f9 100644 --- a/static/results.tmpl +++ b/static/results.tmpl @@ -105,7 +105,7 @@ - No result were found for + No results were found for From 5d46f289265e62bb82027de0c66201a48e6115bf Mon Sep 17 00:00:00 2001 From: kelson42 Date: Wed, 19 Jul 2017 21:55:05 +0200 Subject: [PATCH 2/3] Create AUTHORS file #48 --- AUTHORS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..a0779d089 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,17 @@ +Automactic +Ayoub DARDORY +Cristian Patrasciuc +Dattaz +Elad Keyshawn +Emmanuel Engelhart +Isaac +jleow00 +Julian Harty +Kiran Mathew Koshy +Kunal Mehta +Matthieu Gautier +Rashiq Ahmad +Renaud Gaudin +Shivam +Steve Wills +Synhershko From 1d1dfbf4da6a8b573acffe44a8500995700180df Mon Sep 17 00:00:00 2001 From: kelson42 Date: Sat, 22 Jul 2017 09:29:28 +0200 Subject: [PATCH 3/3] Fix JNI licensing #71 --- src/android/kiwix.cpp | 19 +++++++++++++++++++ src/android/org/kiwix/kiwixlib/JNIKiwix.java | 2 +- .../org/kiwix/kiwixlib/JNIKiwixBool.java | 2 +- .../org/kiwix/kiwixlib/JNIKiwixInt.java | 2 +- .../org/kiwix/kiwixlib/JNIKiwixString.java | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/android/kiwix.cpp b/src/android/kiwix.cpp index 119b37e2b..1f97c0f2c 100644 --- a/src/android/kiwix.cpp +++ b/src/android/kiwix.cpp @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2013 Emmanuel Engelhart + * + * This program 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 3 of the License, or + * any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + #include #include "org_kiwix_kiwixlib_JNIKiwix.h" diff --git a/src/android/org/kiwix/kiwixlib/JNIKiwix.java b/src/android/org/kiwix/kiwixlib/JNIKiwix.java index 41711009e..1b89384a9 100644 --- a/src/android/org/kiwix/kiwixlib/JNIKiwix.java +++ b/src/android/org/kiwix/kiwixlib/JNIKiwix.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 + * Copyright (C) 2013 Emmanuel Engelhart * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/android/org/kiwix/kiwixlib/JNIKiwixBool.java b/src/android/org/kiwix/kiwixlib/JNIKiwixBool.java index 0563f30a4..74563d3ec 100644 --- a/src/android/org/kiwix/kiwixlib/JNIKiwixBool.java +++ b/src/android/org/kiwix/kiwixlib/JNIKiwixBool.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 + * Copyright (C) 2013 Emmanuel Engelhart * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/android/org/kiwix/kiwixlib/JNIKiwixInt.java b/src/android/org/kiwix/kiwixlib/JNIKiwixInt.java index af8d77219..a66c937ff 100644 --- a/src/android/org/kiwix/kiwixlib/JNIKiwixInt.java +++ b/src/android/org/kiwix/kiwixlib/JNIKiwixInt.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 + * Copyright (C) 2013 Emmanuel Engelhart * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/android/org/kiwix/kiwixlib/JNIKiwixString.java b/src/android/org/kiwix/kiwixlib/JNIKiwixString.java index 1e9876e59..2513f9215 100644 --- a/src/android/org/kiwix/kiwixlib/JNIKiwixString.java +++ b/src/android/org/kiwix/kiwixlib/JNIKiwixString.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 + * Copyright (C) 2013 Emmanuel Engelhart * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by