OSDN Git Service
(root)
/
radegast
/
radegast.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Alignment tweak in settings
[radegast/radegast.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
2719fa0
..
676af95
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-4,7
+4,9
@@
bin
obj
compile.bat
*.sln
obj
compile.bat
*.sln
+*.sln.cache
*.csproj
*.csproj
-<<<<<<< HEAD
*.bak
*.bak
+*.resources
*~
*~
+*.userprefs