Merge branch 'read_aloud' into newui
authorrajbot <raj@archive.org>
Tue, 12 Oct 2010 20:47:59 +0000 (20:47 +0000)
committerrajbot <raj@archive.org>
Tue, 12 Oct 2010 20:47:59 +0000 (20:47 +0000)
commita9949a6d54bd20f0bec9c15ad4435d4252c5c87d
tree01d6f430f9daec98fb0b69fcc371c5de581ad550
parenta5a0c806290d7e4b6211da2932f151d255fbf8e5
parentd46e8d427f478920826663f6e58feb385fab9258
Merge branch 'read_aloud' into newui

Conflicts:
BookReader/BookReader.css
BookReader/BookReader.js
BookReader/images/read_aloud.png
BookReaderIA/datanode/BookReaderGetText.py
BookReaderIA/datanode/BookReaderGetTextWrapper.php
BookReaderIA/inc/BookReader.inc
BookReader/BookReader.css
BookReader/BookReader.js
BookReaderIA/datanode/BookReaderJSIA.php
BookReaderIA/inc/BookReader.inc