Skip to content

Commit

Permalink
Merge branch 'branch-5-2' into branch-5-4
Browse files Browse the repository at this point in the history
  • Loading branch information
tbonfort committed Apr 4, 2012
2 parents a872f12 + 0f21972 commit b683965
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .gitignore
@@ -0,0 +1,7 @@
.libs
*.o
*.lo
config.log
config.status
*.dll

0 comments on commit b683965

Please sign in to comment.