Skip to content
Snippets Groups Projects
Commit b74af1c2 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan
Browse files

Merge with trunk

parents 7aec119d 9c394b3a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
.hgignore
+ 1
− 0
View file @ b74af1c2
...@@ -4,6 +4,7 @@ syntax: glob ...@@ -4,6 +4,7 @@ syntax: glob
*~ *~
.*.swp .*.swp
LICENSES LICENSES
indra/.distcc
indra/build-darwin-* indra/build-darwin-*
indra/build-vc[0-9]* indra/build-vc[0-9]*
indra/lib/mono/1.0/*.dll indra/lib/mono/1.0/*.dll
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment