projects / bookreader.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78fafb8 de897e5)
Merge branch 'master' into newui
authorMichael Ang <mang@archive.org>
Fri, 8 Oct 2010 00:12:34 +0000 (00:12 +0000)
committerMichael Ang <mang@archive.org>
Fri, 8 Oct 2010 00:12:34 +0000 (00:12 +0000)
Conflicts:
BookReaderIA/inc/BookReader.inc

1  2 
BookReaderIA/inc/BookReader.inc patch | diff1 | diff2 | blob | history

diff --cc BookReaderIA/inc/BookReader.inc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.