Merge commit 'lance/newui' into mergelanceui
authorMichael Ang <mang@archive.org>
Wed, 6 Oct 2010 00:59:03 +0000 (00:59 +0000)
committerMichael Ang <mang@archive.org>
Wed, 6 Oct 2010 00:59:03 +0000 (00:59 +0000)
commitad312b687b2e805137f78513cc54323b9a12632a
tree2e609df9cf8c1699f1861bd3e488ce6dcddb8fb6
parent4f61bd0f39ac50f526405dbf4f253cff5c04a93f
parent07176b453056d8b1b3124be9b436596633f675d5
Merge commit 'lance/newui' into mergelanceui

Conflicts:
BookReader/BookReader.js
BookReader/BookReader.js