Merge branch 'master' of ssh://bitbucket.org/lorenc/cnr

Conflicts:
	.gitignore
This commit is contained in:
Lorenc 2016-12-21 01:43:28 +11:00
commit 98dfba76c5

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
*
!scriptfiles/COD/
!pawno/include/anticheat/
!pawno/include/anticheat/