- fixed clang compile error "friend declaration specifying a default argument must be the only declaration".
Merge branch 'maint'
- added damage type specific extreme death and extreme crash states. Order of labels is 'Death.extreme.damagetype' ('XDeath.damagetype') and 'Crash.extreme.damagetype'.
- fixed: Damage of type 'extreme' did not get recorded as an extreme death for the mugshot code.
- changed: extreme deaths now only get recorded when an extreme death state was actually used, to ensure that the crash state being used is the correct one associated with the death state.
Merge branch 'master' of https://github.com/rheit/zdoom
- Allow generator expressions to be turned off during pk3 building with CMake.
- On Mac OS X, ensure assembly code is disabled by default (since it won't work).
Merge branch 'maint'
- Fixed: Verbose user info strings were written with an extra backslash
  character between the key and value.
Shuffle FActionMap for better 64-bit alignment.
- Fixed: ACS's PlaySound should mask off the flag bits from the channel
  before passing it to S_IsActorPlayingSomething().
- Fixed: S_IsChannelUsed() is declared as static, so it should be defined
  as such, too.
Merge branch 'maint'
Merge branch 'master' of https://github.com/rheit/zdoom

Conflicts:
	wadsrc/CMakeLists.txt
- adjusted CMakeLists.txt for brightmaps.pk3 and lights.pk3 to same style as for gzdoom.pk3