Merge branch 'touch-toolbar' into unstable
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 9 Apr 2012 00:50:53 +0000 (17:50 -0700)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 9 Apr 2012 00:50:53 +0000 (17:50 -0700)
commitedad1df9a193e4a0e752f3aff727792d53534631
treeaf05d87d7aa9f116ee9f80133bcd1a38fbe89ae4
parenta1defbfef8c81095e00eb1346c2315e0d20ccda5
parentb3d0ebc8e608bced77293f3d02897c25541f666c
Merge branch 'touch-toolbar' into unstable

Conflicts:
src/main/webapp/scripts/interface.js
src/main/webapp/scripts/interface.js