OSDN Git Service

resolve merge conflicts
authorIvailo Monev <xakepa10@laimg.moc>
Mon, 8 Aug 2016 02:08:16 +0000 (02:08 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Mon, 8 Aug 2016 02:08:16 +0000 (02:08 +0000)
commit8afa7523b80e12051d9bb4341582cd2f4e217689
tree607c71ecdcee4f3b3675987fec34b7f10a6f7004
parent8e85c5eba9bf438d3d34aea0b94f67b000fe3693
parent87dfb90dc6c8788d043da509d61003684179a9b6
resolve merge conflicts

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>