TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'gg/development-3.6' into development

Browse source 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
This commit is contained in:
Daniel Buckmaster 2015-01-29 21:17:38 +11:00
commit 014b566014
29 changed files with 252 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/platform/nativeDialogs/msgBox.h
View file

@ -32,7 +32,7 @@
enum MBButtons
{
MBOk,
MBOk = 0,
MBOkCancel,
MBRetryCancel,
MBSaveDontSave,
@ -42,7 +42,7 @@ enum MBButtons
enum MBIcons
{
MIWarning,
MIWarning = 0,
MIInformation,
MIQuestion,
MIStop,