Merge branch 'lanceui' into mergeui
authorMichael Ang <mang@archive.org>
Thu, 30 Sep 2010 19:45:11 +0000 (19:45 +0000)
committerMichael Ang <mang@archive.org>
Thu, 30 Sep 2010 19:45:11 +0000 (19:45 +0000)
commite4abc196a788139e42ce944532bc64db7f5b4507
tree6643305fe52ab329bc3d49ace72c60316671cd22
parent1e6e47365a8d18a9d14d5a395cce956669608f41
parentc7e570c7b0bc52805f4b1abd76a2c414819ac5d1
Merge branch 'lanceui' into mergeui

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