OSDN Git Service
(root)
/
simplecms
/
utakata.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0df910d
)
-gitignoreを更新
author
derui
<derutakayu@user.sourceforge.jp>
Tue, 21 Jul 2009 15:13:27 +0000
(
00:13
+0900)
committer
derui
<derutakayu@user.sourceforge.jp>
Tue, 21 Jul 2009 15:13:27 +0000
(
00:13
+0900)
.gitignore
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index
30ade95
..
1a59e83
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-8,8
+8,5
@@
utakata
*.Po
/test/lexer_test
/test/sublexer_test
-<<<<<<< HEAD:.gitignore
/test/lexer_test_flymake.cpp
-=======
->>>>>>> master:.gitignore
/test/parser_test