]> rtime.felk.cvut.cz Git - jailhouse-test.git/commit
Fix of a bad merge.
authorMaxim Baryshnikov <barysmax@fel.cvut.cz>
Fri, 22 Apr 2016 01:14:18 +0000 (03:14 +0200)
committerMaxim Baryshnikov <barysmax@fel.cvut.cz>
Fri, 22 Apr 2016 01:14:18 +0000 (03:14 +0200)
commitb3e31a6d56a38b1034318b2c2e5e0fef183698c3
tree9d2f224ede880aa19639cc4bf4f459064e43d50f
parent38c82608e73dff924023de5f164879ff5100d6b3
Fix of a bad merge.
l4