update to latest koreader base

pull/1963/head
chrox 8 years ago
parent df65d2972a
commit 25b70007d4

6
.gitignore vendored

@ -8,13 +8,15 @@ lua-*
.vimrc .vimrc
*.o *.o
tags tags
test/*.sdr test/*
*.tar *.tar
*.log *.log
spec/unit/data spec/unit/data
doc/html doc/html
git-rev
emu emu
luacov.stats.out
trace-out.txt
koreader-*.zip koreader-*.zip
koreader-*.apk koreader-*.apk

@ -94,7 +94,7 @@ sudo apt-get install gcc-mingw-w64-i686 g++-mingw-w64-i686
Mac OSX users may need to install these tools: Mac OSX users may need to install these tools:
``` ```
brew install gcc48 nasm binutils libtool autoconf automake sdl2 brew install nasm binutils libtool autoconf automake sdl2
``` ```
A recent version of Android SDK/NDK and `ant` are needed in order to build A recent version of Android SDK/NDK and `ant` are needed in order to build

Loading…
Cancel
Save