Merge commit 'lance/newui' into newui

author Michael Ang <mang@archive.org>

Fri, 15 Oct 2010 19:07:21 +0000 (19:07 +0000)

committer Michael Ang <mang@archive.org>

Fri, 15 Oct 2010 19:07:21 +0000 (19:07 +0000)
author Michael Ang <mang@archive.org>
Fri, 15 Oct 2010 19:07:21 +0000 (19:07 +0000)
committer Michael Ang <mang@archive.org>
Fri, 15 Oct 2010 19:07:21 +0000 (19:07 +0000)
diff --cc BookReader/BookReader.css
Simple merge
diff --cc BookReader/images/marker_chap-off.png

index 6277de2,0000000..5aea393

mode 100644,000000..100644

Binary files differ
author	Michael Ang <mang@archive.org>
	Fri, 15 Oct 2010 19:07:21 +0000 (19:07 +0000)
committer	Michael Ang <mang@archive.org>
	Fri, 15 Oct 2010 19:07:21 +0000 (19:07 +0000)
		1	2
BookReader/BookReader.css	patch \|	diff1 \|	diff2 \|	blob \| history
BookReader/images/marker_chap-off.png	patch \|	diff1 \|	\|	blob \| history