99bc2a83a3
Resolve merge conflict
61da8073d8
Add StockWeapon flag
adc3ce62c2
Update 'W4Gui/Dialogs/EditWeaponDialog.cs'