sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Merge changes from Metacity

Browse source 
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:
Owen W. Taylor 2010-02-11 12:15:23 -05:00
commit 7834bba6f7
Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available