Resolve conflicts between djs55/ and xapi-project/

xapi-project / vhd-tool

Command-line tools for streaming and manipulating vhd format data

Other

8 stars 26 forks source link

Resolve conflicts between djs55/ and xapi-project/ #21

Closed djs55 closed 9 years ago

djs55 commented 9 years ago

The two repos have started diverging including having separate release streams using the same version numbers. This is an attempt to merge everything back together.