Dan Winship 09653fbaf6 Merge branch 'master' into message-tray ...

Conflicts:
	js/ui/main.js

2010-01-05 11:25:15 -05:00

..

misc

Add search.js, rebase search system on top

2009-12-18 10:07:22 -05:00

ui

Merge branch 'master' into message-tray

2010-01-05 11:25:15 -05:00

Makefile.am

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

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