Merge branch 'test' of https://github.com/urbit/urbit into test

This commit is contained in:
C. Guy Yarvin 2015-05-29 12:45:27 -07:00
commit 322cc92427

4
.gitignore vendored
View File

@ -1,12 +1,14 @@
*.swo *.swo
*.swp *.swp
*.o *.o
/outside/**/*.a
.DS_Store .DS_Store
/bin/vere /bin/urbit
/urb/*/ /urb/*/
!/urb/zod/ !/urb/zod/
/outside/re2/obj /outside/re2/obj
/inst /inst
/cmpil
/vere.pkg /vere.pkg
/.MAKEFILE-VERSION /.MAKEFILE-VERSION
/make.conf /make.conf