Merge branch 'master' of git://gitorious.org/webos-internals/applications
authorZuchmir2 <Zuchmir2@gmail.com>
Sun, 26 Jul 2009 07:33:14 +0000 (03:33 -0400)
committerZuchmir2 <Zuchmir2@gmail.com>
Sun, 26 Jul 2009 07:33:14 +0000 (03:33 -0400)
commit898f0ef1f8fcb0e49aaf307ac03278f1e5378080
tree6969418368cca22fc0e0aa0b55050bba30e9392d
parentc75dd8b3035f6b74efa853e909a9e5bd711dca6d
parent9fd02bfa9fe9a5038a47471ac8a4998cc0a6e40b
Merge branch 'master' of git://gitorious.org/webos-internals/applications

Conflicts:
org.webosinternals.terminal/app/controllers/term-assistant.js
termplugin/termplugin.cpp