diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-09-26 12:21:43 +0100 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-09-26 12:21:43 +0100 |
| commit | 364c385f1a5f71c3eb6a80b44c26ddd7af012ec8 (patch) | |
| tree | 48083f2b8d9e914fcb96ed0e0857ac79a34994f8 /.gitignore | |
| parent | 3c1c50fefc4245235ad2f92ac65efa5656f825cb (diff) | |
| parent | 462c549f7725810e55131a62f731357c6b2396ae (diff) | |
Merge branch 'master' of https://github.com/TanninOne/modorganizer.git
# Conflicts:
# .gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1,2 +1,6 @@ *.user Thumbs.db +src/moc_*.cpp +src/ui_*.h +src/*.qrc.depends +src/Modorganizer.* |