]> git.openfabrics.org - ~adrianc/mstflint.git/commitdiff
projects / ~adrianc / mstflint.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2dc532a c4c024e)
fixed merge conflict master_devel
authorAdrian Chiris <adrianc@mellanox.com>
Thu, 17 Nov 2016 09:09:15 +0000 (11:09 +0200)
committerAdrian Chiris <adrianc@mellanox.com>
Thu, 17 Nov 2016 09:09:15 +0000 (11:09 +0200)

Trivial merge
mstflint repository