diff options
| author | mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652> | 2015-02-15 21:09:53 +0000 |
|---|---|---|
| committer | mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652> | 2015-02-15 21:09:53 +0000 |
| commit | 00c5a092c3a19c39f9645a609cdcb2ea1795a224 (patch) | |
| tree | fb18131f27d97767eea4f9b8c54232403e53d12a /LICENSE.md | |
| parent | 897a5d24367bc97f96b073113018905be7411e96 (diff) | |
| parent | f64afc0564b5f9970b65aa81f72f258eaad15bf2 (diff) | |
Merge remote-tracking branch 'origin/v1.0'
Conflicts:
content.tex
makediff.sh
git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/trunk@477 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
Diffstat (limited to 'LICENSE.md')
0 files changed, 0 insertions, 0 deletions