Merge jv
authorMerge Script
Fri, 04 Mar 2016 06:56:25 +0100
branchjv
changeset 1417 7fcc394b8890
parent 1412 638e9d1120d9 (current diff)
parent 1416 acb6c368c340 (diff)
child 1423 f30fc933e35e
Merge
--- a/Hello_utf8.wsp	Thu Mar 03 06:57:58 2016 +0100
+++ b/Hello_utf8.wsp	Fri Mar 04 06:56:25 2016 +0100
@@ -32,5 +32,6 @@
 special: €
 cyrillic: русский язык
 greek: Ελληνικά
+math: ∀∆√∫≠≤≥⌐⌠⌡
 japanese: 日本語
 Chinesisch: 欢迎光临
--- a/Hello_utf8_de.wsp	Thu Mar 03 06:57:58 2016 +0100
+++ b/Hello_utf8_de.wsp	Fri Mar 04 06:56:25 2016 +0100
@@ -31,6 +31,7 @@
 Sonderzeichen: €
 Kyrillisch: русский язык
 Griechisch: Ελληνικά
+Mathematisch: ∀∆√∫≠≤≥⌐⌠⌡
 Japanisch: 日本語
 Chinesisch: 欢迎光临
 
--- a/bc.mak	Thu Mar 03 06:57:58 2016 +0100
+++ b/bc.mak	Fri Mar 04 06:56:25 2016 +0100
@@ -20,8 +20,11 @@
 # CFLAGS_NOCONSOLE=""
 # CFLAGS_APPTYPE=""
 
-# CFLAGS_LOCAL=$(CFLAGS_APPTYPE) -DSTARTUP_CLASS="\"Smalltalk\"" -DSTARTUP_SELECTOR="\"start\"" -DUSE_MODULE_TABLE
+!if defined(USEMINGW32) || defined(USEMINGW64)
 CFLAGS_LOCAL=-DSTARTUP_CLASS="\"Smalltalk\"" -DSTARTUP_SELECTOR="\"start\"" -DUSE_MODULE_TABLE
+!else
+CFLAGS_LOCAL=$(CFLAGS_APPTYPE) -DSTARTUP_CLASS="\"Smalltalk\"" -DSTARTUP_SELECTOR="\"start\"" -DUSE_MODULE_TABLE
+!endif
 
 #
 
--- a/smalltalkWinRC.rc	Thu Mar 03 06:57:58 2016 +0100
+++ b/smalltalkWinRC.rc	Fri Mar 04 06:56:25 2016 +0100
@@ -15,8 +15,8 @@
 
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1,41
-  PRODUCTVERSION  6,2,1,1
+  FILEVERSION     6,5,0,1
+  PRODUCTVERSION  6,5,0,1
 //  FILEFLAGSMASK 0x3fL
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -33,11 +33,11 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X IDE\0"
-      VALUE "FileVersion", "6.2.1.41\0"
+      VALUE "FileVersion", "6.5.0.1\0"
       VALUE "InternalName", "stx:projects/smalltalk\0"
-      VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
+      VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2016\nCopyright eXept Software AG 1998-2016\0"
       VALUE "ProductName", "Smalltalk/X\0"
-      VALUE "ProductVersion", "6.2.1.1\0"
+      VALUE "ProductVersion", "6.5.0.1\0"
       VALUE "ProductDate", "Fri, 20 Jan 2012 11:23:14 GMT\0"
     END
   END