Skip to content

Commit 74b25bd

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents b7b6cd2 + 03a4acd commit 74b25bd

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

examples/pxScene2d/src/macstuff/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.2.0.2</string>
22+
<string>1.3.0.0</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleVersion</key>

examples/pxScene2d/src/pxTextBox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ void pxTextBox::measureTextWithWrapOrNewLine(const char *text, float sx, float s
431431
}
432432

433433
// Check if text still fits on this line, or if wrap needs to occur
434-
if( (tempX + charW) <= lineWidth || (!mWordWrap && lineNumber == 0) || mWordWrap && !isDelimeter_charsPresent)
434+
if( (tempX + charW) <= lineWidth || (!mWordWrap && lineNumber == 0) || (mWordWrap && !isDelimeter_charsPresent))
435435
{
436436
accString.append(tempChar.c_str());
437437
tempX += charW;

examples/pxScene2d/src/win/pxscene.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
IDI_ICON1 ICON Spark_installer.ico
22

33
1 VERSIONINFO
4-
FILEVERSION 1,2,0,2
4+
FILEVERSION 1,3,0,0
55
FILEOS 0x4
66
FILETYPE 0x0
77
BEGIN
@@ -15,7 +15,7 @@ BEGIN
1515
VALUE "LegalCopyright", "Copyright 2018"
1616
VALUE "OriginalFilename", "pxscene.exe"
1717
VALUE "ProductName", "pxscene"
18-
VALUE "ProductVersion", "1,2,0,2"
18+
VALUE "ProductVersion", "1,3,0,0"
1919
END
2020
END
2121

0 commit comments

Comments
 (0)