Go to file
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
.settings Convert all JS style to be uniform, add Eclipse settings bits 2008-11-28 20:12:20 +00:00
data Add (+) and (-) icon artwork, and a little bit of infrastructure for them 2008-12-22 22:05:56 +00:00
js/ui Merge branch 'workspace-salon' 2009-01-19 23:06:59 +00:00
scripts Add (+) and (-) icon artwork, and a little bit of infrastructure for them 2008-12-22 22:05:56 +00:00
src Merge branch 'workspace-salon' 2009-01-19 23:06:59 +00:00
tools/build Repoint clutter to the new git repositories 2008-12-17 16:52:05 +00:00
.project Convert all JS style to be uniform, add Eclipse settings bits 2008-11-28 20:12:20 +00:00
AUTHORS Initial commit 2008-10-31 04:22:44 +00:00
autogen.sh Initial commit 2008-10-31 04:22:44 +00:00
configure.ac Merge branch 'workspace-salon' 2009-01-19 23:06:59 +00:00
COPYING Initial commit 2008-10-31 04:22:44 +00:00
MAINTAINERS Initial commit 2008-10-31 04:22:44 +00:00
Makefile.am Add (+) and (-) icon artwork, and a little bit of infrastructure for them 2008-12-22 22:05:56 +00:00
README Initial commit 2008-10-31 04:22:44 +00:00