Merge remote-tracking branch 'upstream/rv2' into rv2

This commit is contained in:
Andrew 2014-09-28 11:47:59 -07:00
commit da90b07194

3
.gitignore vendored
View file

@ -16,9 +16,6 @@
# include sourcecode # include sourcecode
!src/ !src/
# include special libs like BC
!libs/
# include git important files # include git important files
!.gitmodules !.gitmodules
!.gitignore !.gitignore