]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
projects / people / iwj / osstest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a135942 392a331)
Merge remote-tracking branch 'cam-daemons/master' into wip
authorIan Jackson <ian.jackson@eu.citrix.com>
Mon, 23 Apr 2018 14:49:22 +0000 (15:49 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 23 Apr 2018 14:49:22 +0000 (15:49 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.