Permalink
Browse files

Merge branch 'develop'

Conflicts:
	.gitignore
  • Loading branch information...
2 parents 2454796 + 83fdcd6 commit 224821291f860c0bda5b71d26d595270b4677c49 @erasmusa committed Oct 28, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 .gitignore
View
@@ -1 +1,5 @@
+debian/files
+debian/*.substvars
+debian/*.debhelper.log
+debian/*/*
howto_install.txt

0 comments on commit 2248212

Please sign in to comment.