diff options
| author | Chris Kiefer <chrisk13fer@gmail.com> | 2011-08-25 16:00:21 +0100 |
|---|---|---|
| committer | Chris Kiefer <chrisk13fer@gmail.com> | 2011-08-25 16:00:21 +0100 |
| commit | 9c982dd80c0a73d96cbf8103bc33f1749b204a7c (patch) | |
| tree | 423c8accf9ec62a7849d4e8e9c7d284d5507654e /.gitignore | |
| parent | d595100fefb826174591737727525d486c790b28 (diff) | |
| parent | f246be00cfd2ab25cb921552e9dd5a12c0605df7 (diff) | |
Merge branch 'master' of github.com:micknoise/Maximilian
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -5,4 +5,8 @@ build build -.DS_Store
\ No newline at end of file +.DS_Store +/maximilianTestWindowsVS2010/Debug +/maximilianTestWindowsVS2010/ipch +/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/Debug + |