David Zeuthen 51481bed82 Fix merge conflicts ... Signed-off-by: David Zeuthen <davidz@redhat.com>		2010-11-30 11:11:10 -05:00
..
shaders	[windowDimmer] Bump GLSL version to 1.10	2010-09-11 21:41:47 +02:00
theme	Fix merge conflicts	2010-11-30 11:11:10 -05:00
clock-preferences.ui	Start implementing the Date and Time mockups	2010-10-13 17:53:26 -04:00
close-black.svg	[Overview] Update look and feel of the search field	2010-03-11 21:22:31 +01:00
gnome-shell-clock-preferences.desktop.in.in	Add a simple preference dialog for the clock	2010-05-09 01:07:47 +02:00
gnome-shell.desktop.in.in	Add a desktop file for gnome-shell	2009-08-07 14:13:24 -04:00
gnome-shell.schemas	Use the GNOME 3 WM theme by default	2010-10-31 11:58:44 -04:00
gs-applications.menu	add /usr/local/share/applications to gs-applications.menu	2010-10-25 19:49:26 +04:00
magnifier.svg	Some search appearance fixes for last commit	2009-08-16 10:09:34 -04:00
Makefile.am	dash: Improve DND to dash and allow reordering	2010-11-29 16:35:54 +01:00
org.gnome.accessibility.magnifier.gschema.xml.in	magnifier: Change default values	2010-11-01 16:03:28 +01:00
org.gnome.shell.gschema.xml.in	workspaces-view: Remove MosaicView	2010-11-29 16:35:53 +01:00