projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aeba23d d84a6e2)
Merge branch 'master' into staging
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 19 Dec 2013 16:34:56 +0000 (16:34 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 19 Dec 2013 16:34:56 +0000 (16:34 +0000)
1  2 
Config.mk patch | diff1 | diff2 | blob | history

diff --cc Config.mk
Simple merge
Unnamed repository; edit this file 'description' to name the repository.