diff options
| author | Brian Munro <brian.alexander.munro@gmail.com> | 2017-01-13 08:16:23 +0200 |
|---|---|---|
| committer | Brian Munro <brian.alexander.munro@gmail.com> | 2017-01-13 08:16:23 +0200 |
| commit | bfeda873c40feb1c0bd421efa20cead94f1707cc (patch) | |
| tree | ba1d35630bf0f44bfe4e70326329650f26b8fcb9 /.gitignore | |
| parent | c9766b6e1a5dc794f4f3dbd8d231537ef13b77a4 (diff) | |
| parent | 866a004438e286b5cc7f5fb324a4a0b11d55dc8b (diff) | |
Merge remote-tracking branch 'ZackHaber-upstream/new_vfs_library' into new_vfs_library
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4,6 +4,7 @@ src/moc_*.cpp src/ui_*.h src/*.qrc.depends src/Modorganizer.* +src/*.bak CMakeLists.txt.user edit stderr.log |