xorstream cbd0e6056c Fixed some conflicts

2017-01-23 11:35:00 +11:00

..

regress

Fixed some conflicts

2017-01-23 11:35:00 +11:00

unit

cleanup after msvc port

2017-01-22 21:27:17 +08:00