diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-10-12 12:54:19 +0100 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-10-12 12:54:19 +0100 |
| commit | 077a58f410b4d4ef32f7a9ebc0821f08c3cec6eb (patch) | |
| tree | ba17c41455a06a74224a096544efd3c3355b3e21 /.gitignore | |
| parent | f5c86bc22c23374540d07ef63320b810c39e1df4 (diff) | |
| parent | 7d93a9a2003f31188e4da8cbcd7e5df0352bb900 (diff) | |
Merge branch 'master' of https://github.com/TanninOne/modorganizer into archive_cleanup
# Conflicts:
# src/installationmanager.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -4,3 +4,9 @@ src/moc_*.cpp src/ui_*.h src/*.qrc.depends src/Modorganizer.* +CMakeLists.txt.user +edit +stderr.log +stdout.log +build +.idea |