update readme and specify branch for submodule

This commit is contained in:
Thomas Fussell 2016-09-12 22:23:20 -04:00
parent aa26085110
commit 5585a172cb
2 changed files with 2 additions and 2 deletions

1
.gitmodules vendored
View File

@ -11,3 +11,4 @@
[submodule "third-party/utfcpp"] [submodule "third-party/utfcpp"]
path = third-party/utfcpp path = third-party/utfcpp
url = https://github.com/nemtrif/utfcpp url = https://github.com/nemtrif/utfcpp
branch = master

View File

@ -70,8 +70,7 @@ bin/xlnt.test
## Dependencies ## Dependencies
xlnt uses the following libraries, which are included in the source tree (all but miniz as [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules#Cloning-a-Project-with-Submodules)) for convenience: xlnt uses the following libraries, which are included in the source tree (all but miniz as [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules#Cloning-a-Project-with-Submodules)) for convenience:
- [miniz v1.15_r4](https://code.google.com/p/miniz/) (public domain/unlicense) - [miniz v1.15_r4](https://code.google.com/p/miniz/) (public domain/unlicense)
- [pugixml v1.6](http://pugixml.org/) (MIT license) - [libstudxml v1.1.0](http://www.codesynthesis.com/projects/libstudxml/) (MIT license)
- [Optional](https://github.com/akrzemi1/Optional) (Boost Software License, Version 1.0)
- [utfcpp v2.3.4](http://utfcpp.sourceforge.net/) (Boost Software License, Version 1.0) - [utfcpp v2.3.4](http://utfcpp.sourceforge.net/) (Boost Software License, Version 1.0)
- [cxxtest v4.4](http://cxxtest.com/) (LGPLv3 license [only used for testing, separate from main library assembly]) - [cxxtest v4.4](http://cxxtest.com/) (LGPLv3 license [only used for testing, separate from main library assembly])