8 Commits

Author SHA1 Message Date
renaud gaudin
97fb36ac89 Added command line options to build script 2013-04-06 12:54:21 +02:00
renaud gaudin
6c84338b86 Kelson, you shouldnt have commitet this ahah 2013-04-06 04:05:21 +02:00
kelson42
1b41a6862e Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
Conflicts:
	android/libs/armeabi/libkiwix.so
	android/libs/mips/libkiwix.so
	android/libs/x86/libkiwix.so
2013-04-05 23:40:12 +02:00
kelson42
bccd1d1806 + JNI getRandomPage() 2013-04-05 23:35:56 +02:00
renaud gaudin
045d431070 fixed native on mips and intel 2013-04-05 19:30:45 +02:00
renaud gaudin
04efaa107d minor tweaks to deps 2013-04-05 14:18:06 +02:00
renaud gaudin
8be2a446ac minor fixes to compilation 2013-04-05 11:17:22 +02:00
renaud gaudin
637c65bc8b Merged kiwix-android code into main repo. 2013-04-05 00:25:36 +02:00