Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/devel' into obi-velocystream-test 

* origin/devel:
  ignore boost build files
  removed unecessary file
This commit is contained in:
Jan Christoph Uhde 2016-08-17 13:44:05 +02:00
parent 34c0aa3540 2505049e01
commit 885b1fd30a
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -118,6 +118,11 @@ js/apps/system/_admin/aardvark/APP/frontend/build/style.css
js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part
3rdParty/etcd/src/
3rdParty/boost/1.61.0/b2
3rdParty/boost/1.61.0/bin.v2/
3rdParty/boost/1.61.0/bjam
3rdParty/boost/1.61.0/project-config.jam
3rdParty/boost/1.61.0/stage/
.gdb-history
npm-debug.log

BIN
3rdParty/boost/1.61.0/tools/build/src/engine/bootstrap/jam0 vendored
View File

Binary file not shown.