Merge branch 'gobject-gnomerr'

Browse source

Conflicts:
	panels/display/xrandr-capplet.c

...

This commit is contained in:

Giovanni Campagna 2011-01-06 20:45:40 +01:00

parent d76b70b9b3 66e8e903be

commit de6af5ee29

1 changed files with 325 additions and 335 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

660

panels/display/xrandr-capplet.c

View file

File diff suppressed because it is too large Load diff