Corrected CVS commit clash; small doc changes (removed Windows 3.1 reference since

[wxWidgets.git] / distrib / msw / tmake / filelist.txt

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 1bd11aa65f710c2f58f9cca7c4cd169cd6cfd06f..03b00424358e0b460ff39c229e3e131695eeb65b 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -567,6 +567,7 @@ gauge.cpp   Motif
 gdiobj.cpp     Motif
 glcanvas.cpp   Motif
 icon.cpp       Motif
 gdiobj.cpp     Motif
 glcanvas.cpp   Motif
 icon.cpp       Motif

+joystick.cpp   Motif

 listbox.cpp    Motif
 main.cpp       Motif
 mdi.cpp        Motif
 listbox.cpp    Motif
 main.cpp       Motif
 mdi.cpp        Motif


@@ -1086,7 +1087,6 @@ control.h MotifH
 cursor.h       MotifH
 dataform.h     MotifH
 dataobj.h      MotifH
 cursor.h       MotifH
 dataform.h     MotifH
 dataobj.h      MotifH

-dataobj2.h     MotifH

 dc.h   MotifH
 dcclient.h     MotifH
 dcmemory.h     MotifH
 dc.h   MotifH
 dcclient.h     MotifH
 dcmemory.h     MotifH