conflicts markers removed

[wxWidgets.git] / descrip.mms

diff --git a/descrip.mms b/descrip.mms
index 89711695838f1d5d778c853a2d01320102897962..199fc4d4f1a8c74e98fba985d3040869c737e0ec 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -5,6 +5,13 @@
 # Date : 9 November 1999                                                     *
 #                                                                            *
 #*****************************************************************************
 # Date : 9 November 1999                                                     *
 #                                                                            *
 #*****************************************************************************

+.first
+       set def [-]
+       wx_curdir = f$environment("default")
+       wx_sub = f$element(0,"]",wx_curdir)
+       wx_fuldir = "''wx_sub'.]"
+       define/job/trans=(concealed) wx_root "''wx_fuldir'"
+       set def [.wxwindows]

 
 all : setup.h
        set default [.src.generic]
 
 all : setup.h
        set default [.src.generic]


@@ -15,9 +22,25 @@ all : setup.h
        $(MMS)$(MMSQUALIFIERS)
        set default [-.motif]
        $(MMS)$(MMSQUALIFIERS)
        $(MMS)$(MMSQUALIFIERS)
        set default [-.motif]
        $(MMS)$(MMSQUALIFIERS)

-       set default [--.samples.menu]
+       set default [--.demos.bombs]

        $(MMS)$(MMSQUALIFIERS)
        $(MMS)$(MMSQUALIFIERS)

-       set default [-.samples.minimal]
+       set default [--.samples.caret]
+       $(MMS)$(MMSQUALIFIERS)
+       set default [-.checklst]
+       $(MMS)$(MMSQUALIFIERS)
+       set default [-.config]
+       $(MMS)$(MMSQUALIFIERS)
+       set default [-.controls]
+       $(MMS)$(MMSQUALIFIERS)
+       set default [-.dialogs]
+       $(MMS)$(MMSQUALIFIERS)
+       set default [-.image]
+       $(MMS)$(MMSQUALIFIERS)
+       set default [-.menu]
+       $(MMS)$(MMSQUALIFIERS)
+       set default [-.minimal]
+       $(MMS)$(MMSQUALIFIERS)
+       set default [--.utils.dialoged.src]

        $(MMS)$(MMSQUALIFIERS)
 
 setup.h : setup.h_vms
        $(MMS)$(MMSQUALIFIERS)
 
 setup.h : setup.h_vms