Merge branch 'newui' of https://github.com/lancearthur/bookreader into newui

author rajbot <raj@archive.org>

Tue, 23 Nov 2010 23:32:36 +0000 (23:32 +0000)

committer rajbot <raj@archive.org>

Tue, 23 Nov 2010 23:32:36 +0000 (23:32 +0000)
author rajbot <raj@archive.org>
Tue, 23 Nov 2010 23:32:36 +0000 (23:32 +0000)
committer rajbot <raj@archive.org>
Tue, 23 Nov 2010 23:32:36 +0000 (23:32 +0000)
diff --cc BookReader/BookReader.css
Simple merge
diff --cc BookReader/BookReader.js
Simple merge
author	rajbot <raj@archive.org>
	Tue, 23 Nov 2010 23:32:36 +0000 (23:32 +0000)
committer	rajbot <raj@archive.org>
	Tue, 23 Nov 2010 23:32:36 +0000 (23:32 +0000)
		1	2
BookReader/BookReader.css	patch \|	diff1 \|	diff2 \|	blob \| history
BookReader/BookReader.js	patch \|	diff1 \|	diff2 \|	blob \| history