Merge

Wed, 02 Oct 2013 15:06:38 -0400

author
coleenp
date
Wed, 02 Oct 2013 15:06:38 -0400
changeset 5829
6f73bc5df986
parent 5827
d574419c5372
parent 5828
931f105563c5
child 5831
9855f17334d8

Merge

     1.1 --- a/make/windows/makefiles/fastdebug.make	Wed Oct 02 15:17:20 2013 +0200
     1.2 +++ b/make/windows/makefiles/fastdebug.make	Wed Oct 02 15:06:38 2013 -0400
     1.3 @@ -38,7 +38,7 @@
     1.4  !include ../local.make
     1.5  !include compile.make
     1.6  
     1.7 -CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) /D "CHECK_UNHANDLED_OOPS"
     1.8 +CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION)
     1.9  
    1.10  !include $(WorkSpace)/make/windows/makefiles/vm.make
    1.11  !include local.make

mercurial