projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fef3957 5eeaad5)
Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:23:53 +0000 (08:23 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:23:53 +0000 (08:23 -0600)
1  2 
Makefile.objs patch | diff1 | diff2 | blob | history

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