mirror of
https://github.com/brl/mutter.git
synced 2024-11-12 17:27:03 -05:00
Merge changes from Metacity
Merge all relevant changes from Metacity as of Feb 10, 2010 For future merger's reference, the best way to merge changes from Metacity is to add the Metacity git repository as a remote, then cherry-pick the desired changes - this will exploit the shared history of the two repositories when merging in the changes. Then when finished, use 'git merge -s ours <head commit of metacity>' to record the merge, and 'git commit --amend' to fix up the commit message.
This commit is contained in:
commit
7834bba6f7