Merge remote-tracking branch 'upstream/master'

Author: jmgasper

examples/pxScene2d/src/macstuff/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0.2</string>
+	<string>1.3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

examples/pxScene2d/src/pxTextBox.cpp

@@ -431,7 +431,7 @@ void pxTextBox::measureTextWithWrapOrNewLine(const char *text, float sx, float s
       }
 
       // Check if text still fits on this line, or if wrap needs to occur
-      if( (tempX + charW) <= lineWidth || (!mWordWrap && lineNumber == 0) || mWordWrap && !isDelimeter_charsPresent)
+      if( (tempX + charW) <= lineWidth || (!mWordWrap && lineNumber == 0) || (mWordWrap && !isDelimeter_charsPresent))
       {
         accString.append(tempChar.c_str());
         tempX += charW;

examples/pxScene2d/src/win/pxscene.rc

@@ -1,7 +1,7 @@
 IDI_ICON1 ICON Spark_installer.ico
 
 1 VERSIONINFO
-FILEVERSION 1,2,0,2
+FILEVERSION 1,3,0,0
 FILEOS 0x4
 FILETYPE 0x0
 BEGIN
@@ -15,7 +15,7 @@ BEGIN
       VALUE "LegalCopyright", "Copyright 2018"
       VALUE "OriginalFilename", "pxscene.exe"
       VALUE "ProductName", "pxscene"
-      VALUE "ProductVersion", "1,2,0,2"
+      VALUE "ProductVersion", "1,3,0,0"
     END
   END