Alex Noir b3eaa6bd17 Merge remote-tracking branch 'origin/master' into moStuff ...

# Conflicts:
#	Barotrauma/BarotraumaShared/BarotraumaShared.projitems
#	Barotrauma/BarotraumaShared/Data/clientpermissions.xml

2017-12-23 17:33:24 +03:00

..

BarotraumaClient

Merge remote-tracking branch 'origin/master' into moStuff

2017-12-23 17:33:24 +03:00

BarotraumaServer

Merge branch 'permission-overhaul'. Closes #49

2017-12-20 19:36:17 +02:00

BarotraumaShared

Merge remote-tracking branch 'origin/master' into moStuff

2017-12-23 17:33:24 +03:00

Launcher

Converted the GetAttribute methods in the ToolBox class to extension methods

2017-10-04 18:38:40 +03:00