diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /.gitignore | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to '')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,5 +1,6 @@ | |||
1 | .project | 1 | .project |
2 | .settings | 2 | .settings |
3 | .gitignore | ||
3 | *.csproj | 4 | *.csproj |
4 | *.csproj.user | 5 | *.csproj.user |
5 | *.build | 6 | *.build |
@@ -10,6 +11,7 @@ | |||
10 | *.pidb | 11 | *.pidb |
11 | *.dll.build | 12 | *.dll.build |
12 | *.dll | 13 | *.dll |
14 | *.log | ||
13 | 15 | ||
14 | # Ignore .user and .suo files as these are user preference specific | 16 | # Ignore .user and .suo files as these are user preference specific |
15 | # http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control | 17 | # http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control |
@@ -29,6 +31,7 @@ | |||
29 | */*/*/*/*/bin | 31 | */*/*/*/*/bin |
30 | */*/*/*/*/*/bin | 32 | */*/*/*/*/*/bin |
31 | */*/*/*/*/*/*/bin | 33 | */*/*/*/*/*/*/bin |
34 | addon-modules/ | ||
32 | bin/Debug/*.dll | 35 | bin/Debug/*.dll |
33 | bin/*.dll.mdb | 36 | bin/*.dll.mdb |
34 | bin/*.db | 37 | bin/*.db |