Merge branch 'master' of http://src.krakenengine.com/kraken

2017-04-27 17:49:42 -07:00
parent 41808f29c6 55c71574e8
commit 373af248d1
388 changed files with 23 additions and 1 deletions
--- a/.hgcheck/hg-checkexec-K69hjC
+++ b/.hgcheck/hg-checkexec-K69hjC
--- a/.hgignore
+++ b/.hgignore
--- a/.hgtags
+++ b/.hgtags
--- a/3rdparty/ffts/ffts-master/.gitignore
+++ b/3rdparty/ffts/ffts-master/.gitignore
--- a/3rdparty/ffts/ffts-master/AUTHORS
+++ b/3rdparty/ffts/ffts-master/AUTHORS
--- a/3rdparty/ffts/ffts-master/COPYRIGHT
+++ b/3rdparty/ffts/ffts-master/COPYRIGHT
--- a/3rdparty/ffts/ffts-master/Makefile.am
+++ b/3rdparty/ffts/ffts-master/Makefile.am
--- a/3rdparty/ffts/ffts-master/Makefile.in
+++ b/3rdparty/ffts/ffts-master/Makefile.in
--- a/3rdparty/ffts/ffts-master/README
+++ b/3rdparty/ffts/ffts-master/README
--- a/3rdparty/ffts/ffts-master/aclocal.m4
+++ b/3rdparty/ffts/ffts-master/aclocal.m4
--- a/3rdparty/ffts/ffts-master/build_android.sh
+++ b/3rdparty/ffts/ffts-master/build_android.sh
--- a/3rdparty/ffts/ffts-master/build_iphone.sh
+++ b/3rdparty/ffts/ffts-master/build_iphone.sh
--- a/3rdparty/ffts/ffts-master/config.guess
+++ b/3rdparty/ffts/ffts-master/config.guess
--- a/3rdparty/ffts/ffts-master/config.h.in
+++ b/3rdparty/ffts/ffts-master/config.h.in
--- a/3rdparty/ffts/ffts-master/config.sub
+++ b/3rdparty/ffts/ffts-master/config.sub
--- a/3rdparty/ffts/ffts-master/configure
+++ b/3rdparty/ffts/ffts-master/configure
--- a/3rdparty/ffts/ffts-master/configure.ac
+++ b/3rdparty/ffts/ffts-master/configure.ac
--- a/3rdparty/ffts/ffts-master/depcomp
+++ b/3rdparty/ffts/ffts-master/depcomp
--- a/3rdparty/ffts/ffts-master/ffts.pc.in
+++ b/3rdparty/ffts/ffts-master/ffts.pc.in
--- a/3rdparty/ffts/ffts-master/include/ffts.h
+++ b/3rdparty/ffts/ffts-master/include/ffts.h
--- a/3rdparty/ffts/ffts-master/install-sh
+++ b/3rdparty/ffts/ffts-master/install-sh
--- a/3rdparty/ffts/ffts-master/java/Makefile.am
+++ b/3rdparty/ffts/ffts-master/java/Makefile.am
--- a/3rdparty/ffts/ffts-master/java/Makefile.in
+++ b/3rdparty/ffts/ffts-master/java/Makefile.in
--- a/3rdparty/ffts/ffts-master/java/android/.classpath
+++ b/3rdparty/ffts/ffts-master/java/android/.classpath
--- a/3rdparty/ffts/ffts-master/java/android/.project
+++ b/3rdparty/ffts/ffts-master/java/android/.project
--- a/3rdparty/ffts/ffts-master/java/android/.settings/org.eclipse.jdt.core.prefs
+++ b/3rdparty/ffts/ffts-master/java/android/.settings/org.eclipse.jdt.core.prefs
--- a/3rdparty/ffts/ffts-master/java/android/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/3rdparty/ffts/ffts-master/java/android/.settings/org.eclipse.ltk.core.refactoring.prefs
--- a/3rdparty/ffts/ffts-master/java/android/AndroidManifest.xml
+++ b/3rdparty/ffts/ffts-master/java/android/AndroidManifest.xml
--- a/3rdparty/ffts/ffts-master/java/android/ant.properties
+++ b/3rdparty/ffts/ffts-master/java/android/ant.properties
--- a/3rdparty/ffts/ffts-master/java/android/build.xml
+++ b/3rdparty/ffts/ffts-master/java/android/build.xml
--- a/3rdparty/ffts/ffts-master/java/android/jni/Android.mk
+++ b/3rdparty/ffts/ffts-master/java/android/jni/Android.mk
--- a/3rdparty/ffts/ffts-master/java/android/jni/Application.mk
+++ b/3rdparty/ffts/ffts-master/java/android/jni/Application.mk
--- a/3rdparty/ffts/ffts-master/java/android/proguard-project.txt
+++ b/3rdparty/ffts/ffts-master/java/android/proguard-project.txt
--- a/3rdparty/ffts/ffts-master/java/android/project.properties
+++ b/3rdparty/ffts/ffts-master/java/android/project.properties
--- a/3rdparty/ffts/ffts-master/java/jni/ffts_jni.c
+++ b/3rdparty/ffts/ffts-master/java/jni/ffts_jni.c
--- a/3rdparty/ffts/ffts-master/java/src/nz/ac/waikato/ffts/FFTS.java
+++ b/3rdparty/ffts/ffts-master/java/src/nz/ac/waikato/ffts/FFTS.java
--- a/3rdparty/ffts/ffts-master/ltmain.sh
+++ b/3rdparty/ffts/ffts-master/ltmain.sh
--- a/3rdparty/ffts/ffts-master/m4/ax_check_class.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_check_class.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_check_classpath.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_check_classpath.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_check_java_home.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_check_java_home.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_check_java_plugin.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_check_java_plugin.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_java_check_class.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_java_check_class.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_java_options.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_java_options.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_jni_include_dir.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_jni_include_dir.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_prog_jar.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_prog_jar.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_prog_java.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_prog_java.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_prog_java_cc.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_prog_java_cc.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_prog_java_works.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_prog_java_works.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_prog_javac.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_prog_javac.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_prog_javac_works.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_prog_javac_works.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_prog_javadoc.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_prog_javadoc.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_prog_javah.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_prog_javah.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_try_compile_java.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_try_compile_java.m4
--- a/3rdparty/ffts/ffts-master/m4/ax_try_run_java.m4
+++ b/3rdparty/ffts/ffts-master/m4/ax_try_run_java.m4
--- a/3rdparty/ffts/ffts-master/missing
+++ b/3rdparty/ffts/ffts-master/missing
--- a/3rdparty/ffts/ffts-master/src/Makefile.am
+++ b/3rdparty/ffts/ffts-master/src/Makefile.am
--- a/3rdparty/ffts/ffts-master/src/Makefile.in
+++ b/3rdparty/ffts/ffts-master/src/Makefile.in
--- a/3rdparty/ffts/ffts-master/src/codegen.c
+++ b/3rdparty/ffts/ffts-master/src/codegen.c
--- a/3rdparty/ffts/ffts-master/src/codegen.h
+++ b/3rdparty/ffts/ffts-master/src/codegen.h
--- a/3rdparty/ffts/ffts-master/src/codegen_arm.h
+++ b/3rdparty/ffts/ffts-master/src/codegen_arm.h
--- a/3rdparty/ffts/ffts-master/src/codegen_sse.h
+++ b/3rdparty/ffts/ffts-master/src/codegen_sse.h
--- a/3rdparty/ffts/ffts-master/src/ffts.c
+++ b/3rdparty/ffts/ffts-master/src/ffts.c
--- a/3rdparty/ffts/ffts-master/src/ffts.h
+++ b/3rdparty/ffts/ffts-master/src/ffts.h
--- a/3rdparty/ffts/ffts-master/src/ffts_nd.c
+++ b/3rdparty/ffts/ffts-master/src/ffts_nd.c
--- a/3rdparty/ffts/ffts-master/src/ffts_nd.h
+++ b/3rdparty/ffts/ffts-master/src/ffts_nd.h
--- a/3rdparty/ffts/ffts-master/src/ffts_real.c
+++ b/3rdparty/ffts/ffts-master/src/ffts_real.c
--- a/3rdparty/ffts/ffts-master/src/ffts_real.h
+++ b/3rdparty/ffts/ffts-master/src/ffts_real.h
--- a/3rdparty/ffts/ffts-master/src/ffts_real_nd.c
+++ b/3rdparty/ffts/ffts-master/src/ffts_real_nd.c
--- a/3rdparty/ffts/ffts-master/src/ffts_real_nd.h
+++ b/3rdparty/ffts/ffts-master/src/ffts_real_nd.h
--- a/3rdparty/ffts/ffts-master/src/ffts_small.c
+++ b/3rdparty/ffts/ffts-master/src/ffts_small.c
--- a/3rdparty/ffts/ffts-master/src/ffts_small.h
+++ b/3rdparty/ffts/ffts-master/src/ffts_small.h
--- a/3rdparty/ffts/ffts-master/src/ffts_static.c
+++ b/3rdparty/ffts/ffts-master/src/ffts_static.c
--- a/3rdparty/ffts/ffts-master/src/ffts_static.h
+++ b/3rdparty/ffts/ffts-master/src/ffts_static.h
--- a/3rdparty/ffts/ffts-master/src/macros-alpha.h
+++ b/3rdparty/ffts/ffts-master/src/macros-alpha.h
--- a/3rdparty/ffts/ffts-master/src/macros-altivec.h
+++ b/3rdparty/ffts/ffts-master/src/macros-altivec.h
--- a/3rdparty/ffts/ffts-master/src/macros-neon.h
+++ b/3rdparty/ffts/ffts-master/src/macros-neon.h
--- a/3rdparty/ffts/ffts-master/src/macros-sse.h
+++ b/3rdparty/ffts/ffts-master/src/macros-sse.h
--- a/3rdparty/ffts/ffts-master/src/macros.h
+++ b/3rdparty/ffts/ffts-master/src/macros.h
--- a/3rdparty/ffts/ffts-master/src/neon.h
+++ b/3rdparty/ffts/ffts-master/src/neon.h
--- a/3rdparty/ffts/ffts-master/src/neon.s
+++ b/3rdparty/ffts/ffts-master/src/neon.s
--- a/3rdparty/ffts/ffts-master/src/neon_float.h
+++ b/3rdparty/ffts/ffts-master/src/neon_float.h
--- a/3rdparty/ffts/ffts-master/src/neon_static_f.s
+++ b/3rdparty/ffts/ffts-master/src/neon_static_f.s
--- a/3rdparty/ffts/ffts-master/src/neon_static_i.s
+++ b/3rdparty/ffts/ffts-master/src/neon_static_i.s
--- a/3rdparty/ffts/ffts-master/src/patterns.c
+++ b/3rdparty/ffts/ffts-master/src/patterns.c
--- a/3rdparty/ffts/ffts-master/src/patterns.h
+++ b/3rdparty/ffts/ffts-master/src/patterns.h
--- a/3rdparty/ffts/ffts-master/src/sse.s
+++ b/3rdparty/ffts/ffts-master/src/sse.s
--- a/3rdparty/ffts/ffts-master/src/types.h
+++ b/3rdparty/ffts/ffts-master/src/types.h
--- a/3rdparty/ffts/ffts-master/src/vfp.h
+++ b/3rdparty/ffts/ffts-master/src/vfp.h
--- a/3rdparty/ffts/ffts-master/src/vfp.s
+++ b/3rdparty/ffts/ffts-master/src/vfp.s
--- a/3rdparty/ffts/ffts-master/tests/Makefile.am
+++ b/3rdparty/ffts/ffts-master/tests/Makefile.am
--- a/3rdparty/ffts/ffts-master/tests/Makefile.in
+++ b/3rdparty/ffts/ffts-master/tests/Makefile.in
--- a/3rdparty/ffts/ffts-master/tests/test.c
+++ b/3rdparty/ffts/ffts-master/tests/test.c
--- a/3rdparty/ffts/githubsource.txt
+++ b/3rdparty/ffts/githubsource.txt
--- a/3rdparty/forsyth/forsyth.cpp
+++ b/3rdparty/forsyth/forsyth.cpp
--- a/3rdparty/forsyth/forsyth.h
+++ b/3rdparty/forsyth/forsyth.h
--- a/3rdparty/pvrtexlib/include/PVRTArray.h
+++ b/3rdparty/pvrtexlib/include/PVRTArray.h
--- a/3rdparty/pvrtexlib/include/PVRTDecompress.h
+++ b/3rdparty/pvrtexlib/include/PVRTDecompress.h
--- a/3rdparty/pvrtexlib/include/PVRTError.h
+++ b/3rdparty/pvrtexlib/include/PVRTError.h
--- a/3rdparty/pvrtexlib/include/PVRTGlobal.h
+++ b/3rdparty/pvrtexlib/include/PVRTGlobal.h
--- a/3rdparty/pvrtexlib/include/PVRTMap.h
+++ b/3rdparty/pvrtexlib/include/PVRTMap.h
--- a/Show More
+++ b/Show More