Merge commit 'openlibrary/newui' into newui

author Lance Arthur <lance.arthur@archive.org>

Fri, 15 Oct 2010 19:17:33 +0000 (12:17 -0700)

committer Lance Arthur <lance.arthur@archive.org>

Fri, 15 Oct 2010 19:17:33 +0000 (12:17 -0700)
author Lance Arthur <lance.arthur@archive.org>
Fri, 15 Oct 2010 19:17:33 +0000 (12:17 -0700)
committer Lance Arthur <lance.arthur@archive.org>
Fri, 15 Oct 2010 19:17:33 +0000 (12:17 -0700)
diff --cc BookReader/BookReader.css
Simple merge
diff --cc BookReader/images/marker_chap-off.png

index 0000000,6277de2..5aea393

mode 000000,100644..100644

Binary files differ
author	Lance Arthur <lance.arthur@archive.org>
	Fri, 15 Oct 2010 19:17:33 +0000 (12:17 -0700)
committer	Lance Arthur <lance.arthur@archive.org>
	Fri, 15 Oct 2010 19:17:33 +0000 (12:17 -0700)
		1	2
BookReader/BookReader.css	patch \|	diff1 \|	diff2 \|	blob \| history
BookReader/images/marker_chap-off.png	patch \|	\|	diff2 \|	blob \| history