projects / qemu / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e199d6b 9553206)
merge conflict
authorRiku Voipio <riku.voipio@nokia.com>
Fri, 27 Feb 2009 11:46:11 +0000 (13:46 +0200)
committerRiku Voipio <riku.voipio@nokia.com>
Fri, 27 Feb 2009 11:46:11 +0000 (13:46 +0200)

Trivial merge
Unnamed repository; edit this file to name it for gitweb.