Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Sources/epoch_config/Configs/CfgItemSort.hpp
This commit is contained in:
vbawol 2017-10-03 08:08:13 -05:00
commit 18dd7a5d80
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/epoch_config/Configs/CfgItemSort.hpp
View File

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