g5 merge 충돌 수정

This commit is contained in:
chicpro
2013-10-01 10:19:53 +09:00
4 changed files with 16 additions and 5 deletions

3
.gitignore vendored
View File

@ -19,3 +19,6 @@ cheditor*
*.key
g5_tree
*.sh
kcho07_rss/
mobile/skin/board/bach72_mobile/
skin/board