Merge branch 'master' of ssh://pkgs.fedoraproject.org/mate-settings-daemon

Browse Source

Conflicts:
	commit_rollup.patch

...

This commit is contained in:

Dan Mashal 2012-11-24 08:55:07 -08:00

parent ec3bda847d 911c80b39a

commit 7d0d94b4dd

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available