netradiant: fix entity count in map info, fix #184
Merge commit 'a8192282200b4691a016c4f7757638cbb132f2dc' into master-merge
Merge commit '667d3275589dac91b5bfe96f0244183007be6efd' into master-merge
Merge commit '6134b25a1b87ad94c5a082915064a33ea66b07d7' into master-merge
Merge commit 'f472e6f0e8066e62cf3e159287bb07de97d2e59d' into master-merge
Merge commit '839c9693774fdb0e420391f65b8066e8bd04c591' into master-merge
Merge commit 'a764616a9c1b2f9148e3381f808b600c512592c9' into master-merge
Merge commit 'b681f28130ff2e9789253eff1c1d41163e427eaa' into master-merge
radiant: ask user to restart the editor when map load switches the brush format
radiant: replace StringBuffer with std::string
Merge commit 'dfce2da577f1e56886ad26e58e37d9eda2d7c8a3' into garux-merge
Merge commit '0261afc6df181092b7d57751fec84e21d3ac593c' into garux-merge
Merge commit '804c20949d43175179489ecbb1305752cfa17217' into garux-merge
fix merge
Merge commit '5a8c27d93c0c57243722ade7aa3ca1f696de46f2' into garux-merge
Merge commit 'e7c45da823515747a88569374d62717b72dcf078' into garux-merge
Merge commit '6592d65469e5386216a692ba3b5d6e7cc590c617' into garux-merge
radiant/buildmenu: rename ".[ExecutableType]" as "[ExecutableExt]" - introduce GDEF_OS_EXE_EXT - no need for RADIANT_EXECUTABLE anymore - keep "[ExecutableType]" parsing but it looks useless
radiant: strip .[ExecutableType] entirely (including preceding dot) outside of Windows keep backward compatibility with existing build menus
Merge commit 'fe73dd74d0e40a33c090993390e4d5721a1f9e05' into garux-merge