Colin Walters 5afcf07782 Merge branch 'workspace-salon' ...

Conflicts:
	src/shell-global.c

svn path=/trunk/; revision=152

2009-01-19 23:06:59 +00:00

..

appDisplay.js

load the GAppInfos at startup time rather than waiting until the overlay

2009-01-13 20:45:54 +00:00

button.js

…

docDisplay.js

Escape % in g_app_info_create_from_commandline

2009-01-17 14:41:45 +00:00

genericDisplay.js

…

main.js

Merge branch 'workspace-salon'

2009-01-19 23:06:59 +00:00

overlay.js

…

panel.js

…

runDialog.js

…

windowManager.js

…

workspaces.js

Merge branch 'workspace-salon'

2009-01-19 23:06:59 +00:00