Skip to content

Commit

Permalink
Merge remote branch 'nicfloss/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
BenBE committed Jan 14, 2011
2 parents 568e5bd + f0de882 commit 10fb222
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,4 +1,5 @@
.libs
*.o
*.lo
*~
*.slo
Expand Down

0 comments on commit 10fb222

Please sign in to comment.