summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrangelina <contact@frangelina.fr>2018-06-08 12:25:31 +0200
committerFrangelina <contact@frangelina.fr>2018-06-08 12:25:31 +0200
commiteb2453565778e23e4ac8430fc13e699aaec9858a (patch)
tree93c42bb5163afbe3362d18081232c9b53f5a6080
parent9193808c85eabf52fb9338ee8b8767d53b1592b5 (diff)
parent13426c5c5e32128c7d2982cc3cfb0f869c4a981a (diff)
Merge branch 'master' of ssh://projet/usi/ihm
-rw-r--r--.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5a8c4ff..fe69095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,9 @@ Appli.pro.user.*
*.h.*
.DS_Store
/Makefile
+ui_*.h
+*.o
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+qrc_*.h