Merge remote-tracking branch 'upstream/develop-7.0' into merge-develop-7.0_18.02.2016

livecodepanos · livecodepanos · commit befd49f6db5f · 2016-02-18T15:15:56.000Z
diff --git a/Installer/package.txt b/Installer/package.txt
@@ -634,6 +634,7 @@ component Runtime.iOS
 		file ios:iphoneos8.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
 		file ios:iphoneos8.2/template-entitlements.xcent as "Entitlements.xcent"
 		file ios:iphoneos8.2/template-store-entitlements.xcent as "StoreEntitlements.xcent"
+		file ios:iphoneos8.2/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
 		file ios:iphoneos8.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
 		file ios:iphoneos8.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
 		file ios:iphoneos8.2/template-ResourceRules.plist as "ResourceRules.plist"
@@ -655,6 +656,7 @@ component Runtime.iOS
 		file ios:iphoneos8.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
 		file ios:iphoneos8.4/template-entitlements.xcent as "Entitlements.xcent"
 		file ios:iphoneos8.4/template-store-entitlements.xcent as "StoreEntitlements.xcent"
+		file ios:iphoneos8.4/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
 		file ios:iphoneos8.4/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
 		file ios:iphoneos8.4/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
 		file ios:iphoneos8.4/template-ResourceRules.plist as "ResourceRules.plist"
@@ -676,6 +678,7 @@ component Runtime.iOS
 		file ios:iphoneos9.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
 		file ios:iphoneos9.2/template-entitlements.xcent as "Entitlements.xcent"
 		file ios:iphoneos9.2/template-store-entitlements.xcent as "StoreEntitlements.xcent"
+		file ios:iphoneos9.2/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
 		file ios:iphoneos9.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
 		file ios:iphoneos9.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
 		file ios:iphoneos9.2/template-ResourceRules.plist as "ResourceRules.plist"
diff --git a/builder/installer_utilities.livecodescript b/builder/installer_utilities.livecodescript
@@ -1,4 +1,4 @@
-﻿script "InstallerUtilities"
+script "InstallerUtilities"
 # This is the back-end installer, updater and uninstaller code. 
 # This code doesn't know anything about the product it is installing, and should be capable
 # of being re-used for products other than LiveCode. It reads a "manifest" file, which contains
diff --git a/docs/dictionary/command/mobileControlSet.lcdoc b/docs/dictionary/command/mobileControlSet.lcdoc
@@ -208,7 +208,7 @@ property (enum): The property to be set. Global properties (All native mobile co
 - "hIndicator" (iOS only): Determines whether the horizontal indicator should be displayed when scrolling (maps to the UIScrollView showsHorizontalScrollIndicator property). This is a boolean value.
 - "vIndicator" (iOS only): Determines whether the vertical indicator should be displayed when scrolling (maps to the UIScrollView showsVerticalScrollIndicator property). This is a boolean value.
 - "lockDirection" (iOS only): Determines whether scrolling is locked to the initial direction a drag occurs in (maps to the UIScrollView directionalLockEnabled property). This is a boolean value.
-- "enabled" (iOS only): Determines whether the control is enabled or not. This is a boolean value.
+- "enabled": Determines whether the control is enabled or not. This is a boolean value.
 - "multiline" (Android only): A boolean value which determines whether the control can contain multiple lines of text, wraps text to fit horizontally, and scrolls vertically. If false, the field contains a single line of text which can scroll horizontally.
 value: The value to set the property to.
 
diff --git a/docs/notes/bugfix-13636.md b/docs/notes/bugfix-13636.md
@@ -0,0 +1 @@
+# export snapshot not working on Android
diff --git a/docs/notes/bugfix-16565.md b/docs/notes/bugfix-16565.md
@@ -0,0 +1 @@
+#  Update to OpenSSL 1.0.1q
diff --git a/docs/notes/bugfix-16700.md b/docs/notes/bugfix-16700.md
@@ -0,0 +1 @@
+# URLs hosted on SNI servers are not supported
diff --git a/docs/notes/bugfix-16704.md b/docs/notes/bugfix-16704.md
@@ -0,0 +1 @@
+#   android native multiline ("editable", false) can now be scrolled
diff --git a/docs/notes/bugfix-16735.md b/docs/notes/bugfix-16735.md
@@ -0,0 +1 @@
+#  Added beta entitlement for testflight
diff --git a/docs/notes/bugfix-16737.md b/docs/notes/bugfix-16737.md
@@ -0,0 +1 @@
+#  playstopped message after playing mp3 with player waits until mouse is moved
diff --git a/docs/notes/bugfix-16741.md b/docs/notes/bugfix-16741.md
@@ -0,0 +1 @@
+#  The attached stack will not open in LC 7.1.1
diff --git a/docs/notes/bugfix-16768.md b/docs/notes/bugfix-16768.md
@@ -0,0 +1 @@
+# Update to libpng 1.5.26
diff --git a/docs/notes/bugfix-16772.md b/docs/notes/bugfix-16772.md
@@ -0,0 +1 @@
+# Android: fix incorrect offset of the working screenrect
diff --git a/docs/notes/bugfix-16853.md b/docs/notes/bugfix-16853.md
@@ -0,0 +1 @@
+#   set htlmtext crash if there are spaces between <attribute_name> and "=" sign
diff --git a/docs/notes/bugfix-16859.md b/docs/notes/bugfix-16859.md
@@ -0,0 +1 @@
+#  Make sure chmod is not used by Windows installer
diff --git a/docs/notes/bugfix-16889.md b/docs/notes/bugfix-16889.md
@@ -0,0 +1 @@
+#  Fix crash when going to a substack
diff --git a/docs/notes/bugfix-16932.md b/docs/notes/bugfix-16932.md
@@ -0,0 +1 @@
+#   Page Setup and Printer Dialogues now open successfully
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -333,6 +333,7 @@
 									'rsrc/mobile-disable-ats-template.plist',
 									'rsrc/template-entitlements.xcent',
 									'rsrc/template-store-entitlements.xcent',
+									'rsrc/template-beta-report-entitlement.xcent',
 									'rsrc/template-remote-notification-entitlements.xcent',
 									'rsrc/template-remote-notification-store-entitlements.xcent',
 									'rsrc/template-ResourceRules.plist',
diff --git a/engine/src/desktop.cpp b/engine/src/desktop.cpp
@@ -1362,7 +1362,10 @@ void MCPlatformHandlePlayerFinished(MCPlatformPlayerRef p_player)
     t_player = find_player(p_player);
     if (t_player == nil)
         return;
-    
+		
+	// PM-2016-01-18: [[ Bug 16737 ]] Make sure controller is updated and playstopped msg is sent immediately
+    MCPlatformBreakWait();
+	
     t_player -> layer_redrawall();
     t_player -> moviefinished();
 }
diff --git a/engine/src/fieldhtml.cpp b/engine/src/fieldhtml.cpp
@@ -1616,7 +1616,7 @@ static void import_html_change_style(import_html_t& ctxt, const import_html_tag_
 			for(uint32_t i = 0; i < p_tag . attr_count; i++)
 			{
 				// MW-2012-03-16: [[ Bug ]] LinkText without link style is encoded with a 'name' attr.
-				if (p_tag . attrs[i] . type == kImportHtmlAttrName || p_tag . attrs[i] . type == kImportHtmlAttrHref)
+				if (p_tag . attrs[i] . value != nil && (p_tag . attrs[i] . type == kImportHtmlAttrName || p_tag . attrs[i] . type == kImportHtmlAttrHref))
 				{
 					MCValueRelease(t_linktext);
 					/* UNCHECKED */ MCStringCreateWithNativeChars((const char_t *)p_tag . attrs[i] . value, strlen(p_tag . attrs[i] . value), t_linktext);
@@ -1643,8 +1643,13 @@ static void import_html_change_style(import_html_t& ctxt, const import_html_tag_
 			for(uint32_t i = 0; i < p_tag . attr_count; i++)
 				if (p_tag . attrs[i] . type == kImportHtmlAttrSrc)
 				{
-					MCValueRelease(t_src);
-					/* UNCHECKED */ MCStringCreateWithNativeChars((const char_t *)p_tag . attrs[i] . value, strlen(p_tag . attrs[i] . value), t_src);
+					// PM-2015-02-05: [[ Bug 16853 ]] Allow spaces between <atribute_name> and "=" sign
+					// Nil-check before passing it to strlen
+					if (p_tag . attrs[i] . value != nil)
+					{
+						MCValueRelease(t_src);
+						/* UNCHECKED */ MCStringCreateWithNativeChars((const char_t *)p_tag . attrs[i] . value, strlen(p_tag . attrs[i] . value), t_src);
+					}
 				}
 			
 			if (t_src != nil)
@@ -1752,7 +1757,7 @@ static void import_html_change_style(import_html_t& ctxt, const import_html_tag_
 			MCStringRef t_metadata;
 			t_metadata = nil;
 			for(uint32_t i = 0; i < p_tag . attr_count; i++)
-				if (p_tag . attrs[i] . type == kImportHtmlAttrMetadata)
+				if (p_tag . attrs[i] . value != nil && p_tag . attrs[i] . type == kImportHtmlAttrMetadata)
 				{
 					MCValueRelease(t_metadata);
 					MCStringCreateWithCString(p_tag . attrs[i] . value, t_metadata);
diff --git a/engine/src/java/com/runrev/android/Engine.java b/engine/src/java/com/runrev/android/Engine.java
@@ -1117,6 +1117,21 @@ public void onListPickerDone(int p_index, boolean p_done)
             doProcess(false);
     }
 
+////////////////////////////////////////////////////////////////////////////////
+	
+	// Return a bitmap snapshot of the specified region of the root view
+	public Object getSnapshotBitmapAtSize(int x, int y, int width, int height, int sizeWidth, int sizeHeight)
+	{
+		Bitmap t_bitmap = Bitmap.createBitmap(sizeWidth, sizeHeight, Bitmap.Config.ARGB_8888);
+		Canvas t_canvas = new Canvas(t_bitmap);
+		t_canvas.scale((float)sizeWidth / (float)width, (float)sizeHeight / (float)height);
+		t_canvas.translate((float)-x, (float)-y);
+		
+		getActivity().getWindow().getDecorView().getRootView().draw(t_canvas);
+		
+		return t_bitmap;
+	}
+	
 ////////////////////////////////////////////////////////////////////////////////
 
 	public String getSystemVersion()
@@ -1195,10 +1210,13 @@ private Rect getWorkarea(boolean p_update, int p_new_width, int p_new_height)
 		
 		boolean t_portrait = t_viewport.height() > t_viewport.width();
 
+		int[] t_origin = new int[2];
+		getLocationOnScreen(t_origin);
+		
 		// We have new values and the keyboard isn't showing so update any sizes we don't already know
 		if (p_update && !m_keyboard_visible)
 		{
-			t_working_rect = new Rect(0, 0, p_new_width, p_new_height);
+			t_working_rect = new Rect(t_origin[0], t_origin[1], t_origin[0] + p_new_width, t_origin[1] + p_new_height);
 			
 			if (t_portrait && !m_know_portrait_size)
 			{
@@ -1232,6 +1250,7 @@ else if (!t_portrait && m_know_landscape_size)
 			t_working_rect = new Rect(t_viewport);
 			if (m_know_statusbar_size)
 				t_working_rect.bottom -= m_statusbar_size;
+			t_working_rect.offsetTo(t_origin[0], t_origin[1]);
 		}
 		
 		return t_working_rect;
diff --git a/engine/src/java/com/runrev/android/nativecontrol/InputControl.java b/engine/src/java/com/runrev/android/nativecontrol/InputControl.java
@@ -86,7 +86,7 @@ public void onTextChanged(CharSequence text, int start, int lengthBefore, int le
                 m_module.getEngine().wakeEngineThread();
             }
         });
-        
+		
 		m_text_view.setGravity(Gravity.LEFT | Gravity.TOP);
 		
         return m_text_view;
@@ -96,11 +96,21 @@ public void setEnabled(boolean p_enabled)
     {
         m_text_view.setEnabled(p_enabled);
     }
+	
+	public void setEditable(boolean p_editable)
+    {
+		m_text_view.setFocusable(p_editable);
+    }
     
     public boolean getEnabled()
     {
         return m_text_view.isEnabled();
     }
+	
+	public boolean getEditable()
+    {
+        return m_text_view.isFocusable();
+    }
     
     public void setText(String p_text)
     {
diff --git a/engine/src/mblandroiddc.cpp b/engine/src/mblandroiddc.cpp
@@ -466,7 +466,54 @@ void MCScreenDC::setbeep(uint4 property, int4 beep)
 
 MCImageBitmap *MCScreenDC::snapshot(MCRectangle &r, uint4 window, MCStringRef displayname, MCPoint *size)
 {
-	return NULL;
+	// scale rectangle from logical -> device coords
+	MCRectangle t_rect;
+	t_rect = logicaltoscreenrect(r);
+	
+	// don't scale size - we want the bitmap to be sized to logical coords.
+	int16_t t_size_width, t_size_height;
+	if (size != nil)
+	{
+		t_size_width = size->x;
+		t_size_height = size->y;
+	}
+	else
+	{
+		t_size_width = r.width;
+		t_size_height = r.height;
+	}
+	
+	jobject t_bitmap;
+	// get snapshot image as java Bitmap object
+	MCAndroidEngineRemoteCall("getSnapshotBitmapAtSize", "oiiiiii", &t_bitmap, t_rect.x, t_rect.y, t_rect.width, t_rect.height, t_size_width, t_size_height);
+	if (t_bitmap == nil)
+		return nil;
+	
+	// read Bitmap info & data into MCImageBitmap struct
+	JNIEnv *env;
+	env = MCJavaGetThreadEnv();
+	AndroidBitmapInfo t_info;
+	AndroidBitmap_getInfo(env, t_bitmap, &t_info);
+	
+	MCImageBitmap t_imagebitmap;
+	t_imagebitmap.width = t_info.width;
+	t_imagebitmap.height = t_info.height;
+	t_imagebitmap.stride = t_info.stride;
+	
+	if (AndroidBitmap_lockPixels(env, t_bitmap, (void**)&t_imagebitmap.data) < 0)
+		return nil;
+	
+	MCImageBitmapCheckTransparency(&t_imagebitmap);
+	
+	MCImageBitmap *t_copy;
+	t_copy = nil;
+	
+	// return a copy of the image bitmap
+	MCImageCopyBitmap(&t_imagebitmap, t_copy);
+	
+	AndroidBitmap_unlockPixels(env, t_bitmap);
+	
+	return t_copy;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/engine/src/mblandroidinput.cpp b/engine/src/mblandroidinput.cpp
@@ -219,6 +219,7 @@ class MCAndroidInputControl: public MCAndroidControl
     void SetTextAlign(MCExecContext& ctxt, MCNativeControlInputTextAlign p_align);
     void SetVerticalTextAlign(MCExecContext& ctxt, MCNativeControlInputVerticalAlign p_align);
     void SetEnabled(MCExecContext& ctxt, bool p_value);
+	void SetEditable(MCExecContext& ctxt, bool p_value);
     void SetAutoCapitalizationType(MCExecContext& ctxt, MCNativeControlInputCapitalizationType p_type);
     void SetAutoCorrectionType(MCExecContext& ctxt, MCNativeControlInputAutocorrectionType p_type);
     void SetKeyboardType(MCExecContext& ctxt, MCNativeControlInputKeyboardType p_type);
@@ -235,6 +236,7 @@ class MCAndroidInputControl: public MCAndroidControl
     void GetTextAlign(MCExecContext& ctxt, MCNativeControlInputTextAlign& r_align);
     void GetVerticalTextAlign(MCExecContext& ctxt, MCNativeControlInputVerticalAlign& r_align);
     void GetEnabled(MCExecContext& ctxt, bool& r_value);
+	void GetEditable(MCExecContext& ctxt, bool& r_value);
     void GetAutoCapitalizationType(MCExecContext& ctxt, MCNativeControlInputCapitalizationType& r_type);
     void GetAutoCorrectionType(MCExecContext& ctxt, MCNativeControlInputAutocorrectionType& r_type);
     void GetKeyboardType(MCExecContext& ctxt, MCNativeControlInputKeyboardType& r_type);
@@ -267,7 +269,7 @@ MCPropertyInfo MCAndroidInputControl::kProperties[] =
     DEFINE_RW_CTRL_PROPERTY(P_FONT_SIZE, UInt32, MCAndroidInputControl, TextSize)
     DEFINE_RW_CTRL_ENUM_PROPERTY(P_TEXT_ALIGN, NativeControlInputTextAlign, MCAndroidInputControl, TextAlign)
     DEFINE_RW_CTRL_PROPERTY(P_ENABLED, Bool, MCAndroidInputControl, Enabled)
-    DEFINE_RW_CTRL_PROPERTY(P_EDITABLE, Bool, MCAndroidInputControl, Enabled)
+    DEFINE_RW_CTRL_PROPERTY(P_EDITABLE, Bool, MCAndroidInputControl, Editable)
     DEFINE_RW_CTRL_ENUM_PROPERTY(P_AUTO_CAPITALIZATION_TYPE, NativeControlInputCapitalizationType, MCAndroidInputControl, AutoCapitalizationType)
     DEFINE_RW_CTRL_ENUM_PROPERTY(P_AUTOCORRECTION_TYPE, NativeControlInputAutocorrectionType, MCAndroidInputControl, AutoCorrectionType)
     DEFINE_RW_CTRL_ENUM_PROPERTY(P_KEYBOARD_TYPE, NativeControlInputKeyboardType, MCAndroidInputControl, KeyboardType)
@@ -421,6 +423,17 @@ void MCAndroidInputControl::SetEnabled(MCExecContext& ctxt, bool p_value)
         MCAndroidObjectRemoteCall(t_view, "setEnabled", "vb", nil, p_value);
 }
 
+// PM-2015-01-14: [[ Bug 16704 ]] Allow a non-editable multiline fld to be scrolled
+void MCAndroidInputControl::SetEditable(MCExecContext& ctxt, bool p_value)
+{
+    jobject t_view;
+    t_view = GetView();
+    
+    if (t_view != nil)
+        MCAndroidObjectRemoteCall(t_view, "setEditable", "vb", nil, p_value);
+}
+
+
 void MCAndroidInputControl::SetAutoCapitalizationType(MCExecContext& ctxt, MCNativeControlInputCapitalizationType p_type)
 {
     jobject t_view;
@@ -696,6 +709,17 @@ void MCAndroidInputControl::GetEnabled(MCExecContext& ctxt, bool& r_value)
         r_value = false;
 }
 
+void MCAndroidInputControl::GetEditable(MCExecContext& ctxt, bool& r_value)
+{
+    jobject t_view;
+    t_view = GetView();
+    
+    if (t_view != nil)
+        MCAndroidObjectRemoteCall(t_view, "getEditable", "b", &r_value);
+    else
+        r_value = false;
+}
+
 void MCAndroidInputControl::GetAutoCapitalizationType(MCExecContext& ctxt, MCNativeControlInputCapitalizationType& r_type)
 {
     jobject t_view;
diff --git a/engine/src/opensslsocket.cpp b/engine/src/opensslsocket.cpp
@@ -2086,6 +2086,27 @@ Boolean MCSocket::sslconnect()
 		SSL_set_fd(_ssl_conn, fd);
 	}
 
+    MCAutoStringRef t_hostname;
+    // MM-2014-06-13: [[ Bug 12567 ]] If an end host has been specified, verify against that.
+    //   Otherwise, use the socket name as before.
+    if (!MCNameIsEmpty(endhostname))
+        /* UNCHECKED */ MCStringMutableCopy(MCNameGetString(endhostname), &t_hostname);
+    else
+        /* UNCHECKED */ MCStringMutableCopy(MCNameGetString(name), &t_hostname);
+
+    uindex_t t_pos;
+    if (MCStringFirstIndexOfChar(*t_hostname, ':', 0, kMCCompareExact, t_pos))
+        /* UNCHECKED */ MCStringRemove(*t_hostname, MCRangeMake(t_pos, MCStringGetLength(*t_hostname) - t_pos));
+    else if (MCStringFirstIndexOfChar(*t_hostname, '|', 0, kMCCompareExact, t_pos))
+        /* UNCHECKED */ MCStringRemove(*t_hostname, MCRangeMake(t_pos, MCStringGetLength(*t_hostname) - t_pos));
+
+    MCAutoPointer<char> t_host;
+    /* UNCHECKED */ MCStringConvertToCString(*t_hostname, &t_host);
+
+    // Let the SSL lib know the host we are trying to connect to, ensuring any SNI servers
+    // send the correct certificate during the handshake
+    SSL_set_tlsext_host_name(_ssl_conn, *t_host);
+    
 	// Start the SSL connection
 
 	// MW-2005-02-17: Implement the post-connection check suggested by the SSL Book.
@@ -2096,20 +2117,6 @@ Boolean MCSocket::sslconnect()
 	{
 		if (sslverify)
 		{
-			MCAutoStringRef t_hostname;
-			// MM-2014-06-13: [[ Bug 12567 ]] If an end host has been specified, verify against that.
-			//   Otherwise, use the socket name as before.
-            if (!MCNameIsEmpty(endhostname))
-                /* UNCHECKED */ MCStringMutableCopy(MCNameGetString(endhostname), &t_hostname);
-            else
-                /* UNCHECKED */ MCStringMutableCopy(MCNameGetString(name), &t_hostname);
-            
-            uindex_t t_pos;
-            if (MCStringFirstIndexOfChar(*t_hostname, ':', 0, kMCCompareExact, t_pos))
-            /* UNCHECKED */ MCStringRemove(*t_hostname, MCRangeMake(t_pos, MCStringGetLength(*t_hostname) - t_pos));
-            else if (MCStringFirstIndexOfChar(*t_hostname, '|', 0, kMCCompareExact, t_pos))
-            /* UNCHECKED */ MCStringRemove(*t_hostname, MCRangeMake(t_pos, MCStringGetLength(*t_hostname) - t_pos));
-        
 #if defined(TARGET_SUBPLATFORM_IPHONE) || defined(TARGET_SUBPLATFORM_ANDROID)
             // MM-2015-06-04: [[ MobileSockets ]] On the mobile platforms we verify the certificate ourselves rather than using OpenSSL
             if (!MCSSLVerifyCertificate(_ssl_conn, *t_hostname, sslerror))
@@ -2118,9 +2125,6 @@ Boolean MCSocket::sslconnect()
                 return False;
             }
 #else
-            MCAutoPointer<char> t_host;
-            /* UNCHECKED */ MCStringConvertToCString(*t_hostname, &t_host);
-
             rc = post_connection_check(_ssl_conn, *t_host);
             
             if (rc != X509_V_OK)
diff --git a/engine/src/paragraf.cpp b/engine/src/paragraf.cpp
@@ -325,8 +325,9 @@ void MCParagraph::SetBlockDirectionLevel(findex_t si, findex_t ei, uint8_t level
         bptr->SetDirectionLevel(level);
         bptr = bptr->next();
     }
+	// PM-2016-01-19: [[ Bug 16741]] If bptr == bptr->next() then LC never exits this endless loop and hangs
     while (t_block_index + t_block_length < gettextlength()
-           && t_block_index + t_block_length < ei);
+           && t_block_index + t_block_length < ei && bptr != bptr->next());
 }
 
 void MCParagraph::resolvetextdirections()
diff --git a/engine/src/stack2.cpp b/engine/src/stack2.cpp
@@ -2081,7 +2081,8 @@ void MCStack::setwindowname()
 
 void MCStack::reopenwindow()
 {
-	if (state & CS_FOREIGN_WINDOW)
+	// PM-2016-02-09: [[ Bug 16889 ]] Exit if window is NULL
+	if (state & CS_FOREIGN_WINDOW || window == NULL)
 		return;
 
 	stop_externals();
diff --git a/prebuilt/scripts/build-openssl.sh b/prebuilt/scripts/build-openssl.sh
diff --git a/prebuilt/versions/openssl b/prebuilt/versions/openssl
diff --git a/version b/version

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-script "InstallerUtilities"`
	`1`	`+script "InstallerUtilities"`
`2`	`2`	`# This is the back-end installer, updater and uninstaller code.`
`3`	`3`	`# This code doesn't know anything about the product it is installing, and should be capable`
`4`	`4`	`# of being re-used for products other than LiveCode. It reads a "manifest" file, which contains`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# export snapshot not working on Android`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# URLs hosted on SNI servers are not supported`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# android native multiline ("editable", false) can now be scrolled`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Added beta entitlement for testflight`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# playstopped message after playing mp3 with player waits until mouse is moved`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# The attached stack will not open in LC 7.1.1`