diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
| commit | eb2e62609992ab8b47f8805f2bc2cafce271b66f (patch) | |
| tree | 58d6c387f910e3a3348a6528127f4216b524ec57 /.gitignore | |
| parent | 05dc1666dc794ed6aa7f6568b768c652f8922c4e (diff) | |
| parent | 8d06606835e3d01f537ebe96de8b216e64a1f969 (diff) | |
| download | mana-lpc2012.tar.gz mana-lpc2012.tar.bz2 mana-lpc2012.tar.xz mana-lpc2012.zip | |
Merge branch 'master' into lpc2012lpc2012
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -28,7 +28,7 @@ packaging/windows/upx/* data/music/*.ogg # files created by Qt Creator -mana.creator.user* +CMakeLists.txt.user* # files created by gtags GPATH @@ -53,4 +53,4 @@ Xcode/mana.xcodeproj/xcuserdata Xcode/mana.xcodeproj/project.xcworkspace/xcuserdata Xcode/mana-10.7.xcodeproj/xcuserdata Xcode/mana-10.7.xcodeproj/project.xcworkspace/xcuserdata -.DS_Store
\ No newline at end of file +.DS_Store |