1
0
Fork 0

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-10-20 16:50:49 +02:00
commit 049076365d
1 changed files with 13 additions and 1 deletions

View File

@ -54,6 +54,19 @@
* https://coreos.com/using-coreos/etcd/ * https://coreos.com/using-coreos/etcd/
* [Apache 2 License](https://github.com/coreos/etcd/blob/master/LICENSE) * [Apache 2 License](https://github.com/coreos/etcd/blob/master/LICENSE)
### Bison
* https://www.gnu.org/software/bison/
* GNU GPL3
* only used to generate code, not part of the distribution
* see https://github.com/arangodb/arangodb/blob/devel/arangod/Aql/grammar.cpp#L20
### Flex
* http://flex.sourceforge.net/
* only used to generate code, not part of the distribution
* [free as-is license](http://flex.sourceforge.net/manual/Copyright.html#Copyright)
## Javascript, Node and NPM ## Javascript, Node and NPM
### Node core modules ### Node core modules
@ -197,7 +210,6 @@
#### Handlebars #### Handlebars
* MIT License * MIT License
#### Highlight.js #### Highlight.js