]> xenbits.xen.org Git - xenclient/xen-pq.git/commit
projects / xenclient / xen-pq.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 653f54a) | patch
Remove a remaining conflict.
authorJean Guyader <jean.guyader@eu.citrix.com>
Thu, 8 Oct 2009 17:56:04 +0000 (18:56 +0100)
committerJean Guyader <jean.guyader@eu.citrix.com>
Thu, 8 Oct 2009 17:56:04 +0000 (18:56 +0100)
commit68d6b5b9803ebbd6cf4b4cf5bcb00089873dd80e
tree720d43f4cae73dcd7ef4191d448b64ccda36f5a7tree
parent653f54a2d228714eced80715509fa02a5f19e177commit | diff
Remove a remaining conflict.
master/xen-unstable-netchannel2 diff | blob | blame | history
Unnamed repository; edit this file to name it for gitweb.