OSDN Git Service
(root)
/
radegast
/
radegast.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0eb905f
)
Merge
author
Latif Khalifa
<latifer@streamgrid.net>
Sun, 25 Mar 2012 01:47:42 +0000
(
01:47
+0000)
committer
Latif Khalifa
<latifer@streamgrid.net>
Sun, 25 Mar 2012 01:47:42 +0000
(
01:47
+0000)
git-svn-id: https://radegast.googlecode.com/svn/trunk@1255
f7a694da
-4d33-11de-9ad6-
1127a62b9fcd
.gitignore
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index
ab47dd5
..
2719fa0
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-5,5
+5,6
@@
obj
compile.bat
*.sln
*.csproj
+<<<<<<< HEAD
*.bak
*~
OSDN Git Service
