Colin Walters 75da772d05 Merge branch 'master' into overlay-design02 ...

Conflicts:
	js/ui/appDisplay.js

2009-06-18 13:12:21 -04:00

..

misc

Make ShellAppMonitor and ShellAppSystem singletons, remove unused code in appDisplay

2009-06-18 12:27:19 -04:00

ui

Merge branch 'master' into overlay-design02

2009-06-18 13:12:21 -04:00

Makefile.am

Split appDisplay and docDisplay into "model" and "view" parts

2009-06-16 18:50:42 -04:00