Merge branch 'master' of ssh://xen/var/git/arg
Conflicts: pongr/pong.pb
This commit is contained in:
commit
4e6468eaa4
1 changed files with 1 additions and 1 deletions
|
@ -60,4 +60,4 @@ EndIf
|
|||
; Folding = -
|
||||
; EnableXP
|
||||
; EnableCompileCount = 0
|
||||
; EnableBuildCount = 0
|
||||
; EnableBuildCount = 0
|
||||
|
|
Reference in a new issue