Merge branch 'unstable' into touch-support
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Fri, 26 Aug 2011 21:00:14 +0000 (14:00 -0700)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Fri, 26 Aug 2011 21:00:14 +0000 (14:00 -0700)
commitc725dee26fa34cc9a8f852f729419babe68383dd
tree2a3ba9f0aa890a315f1ab4d23a6692bc10ffbe31
parent79583188db9fda876df2fb93c42f8d94a6e7fdda
parent9a076a13d9ded7d889d6b7d2a153b28ba4102412
Merge branch 'unstable' into touch-support

Conflicts:
src/main/resources/mouse.js
src/main/resources/mouse.js