Merge remote-tracking branch 'refs/remotes/origin/release' into experimental

# Conflicts:
#	Sources/epoch_config/Configs/CfgItemSort.hpp
This commit is contained in:
vbawol 2017-10-03 08:08:13 -05:00
commit 18dd7a5d80

View File

@ -2,7 +2,6 @@
class CfgItemSort class CfgItemSort
{ {
class MainCategories class MainCategories
{ {
classes[] = { classes[] = {