commit before merging

qwazix · Jul 22, 2012 · e5fa342 · e5fa342
1 parent 79466c3
commit e5fa342
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 298 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
+*.o
+moc*
+*.pro.user
+
 MANIFEST
 *~