rolfbjarne

diff --git a/tools/mtouch/devcontroller.cs b/tools/mtouch/devcontroller.cs
index 900994c..e848d41 100644
--- a/tools/mtouch/devcontroller.cs
+++ b/tools/mtouch/devcontroller.cs
@@ -415,6 +415,8 @@ namespace MonoTouch
 
 			DeviceDiscovery.EnumerateDevices (MTouch.Timeout, (dev) =>
 				{
+					dev.ValidatePairing ();
+					dev.StartSession ();

rolfbjarne

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 3c803ae..bfb3b4d 100644
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -2335,6 +2335,11 @@ emit_aot_data (MonoAotCompile *acfg, MonoAotFileTable table, const char *symbol,
 		acfg->table_offsets [(int)table] = acfg->datafile_offset;
 		fwrite (data,1, size, acfg->data_outfile);
 		acfg->datafile_offset += size;
+		int remained = 16 - size % 16;
+		acfg->datafile_offset += remained;

rolfbjarne

commit f04caf86e9725926d51f20ad78ac65f7f045b115
Author: Rolf Bjarne Kvinge <[email protected]>
Date:   Wed Jan 6 13:56:43 2016 +0100

    [aot] Fix emission of external aot data by aligning tables in the file.
    
    The table reading code depends on data being aligned, so make sure it is.

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 3c803ae..4c7edd5 100644

rolfbjarne

commit 1cbbb44782e2eef3aa5901deb3d8d9c12f046a24
Author: Rolf Bjarne Kvinge <[email protected]>
Date:   Wed Jan 6 13:56:43 2016 +0100

    [aot] Fix emission of external aot data by aligning tables in the file.
    
    The table reading code depends on data being aligned, so make sure it is.

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 3c803ae..dbf906a 100644

rolfbjarne

diff --git a/src/CommonCrypto/Makefile b/src/CommonCrypto/Makefile
index 0e6764d..6b280b1 100644
--- a/src/CommonCrypto/Makefile
+++ b/src/CommonCrypto/Makefile
@@ -1,8 +1,14 @@
 ifeq ($(SYSTEM_MCS),)
 SYSTEM_MCS=/Library/Frameworks/Mono.framework/Commands/mcs
+ifeq ("$(wildcard $(SYSTEM_MCS))","")
+SYSTEM_MCS=mcs
+endif

rolfbjarne

diff --git a/inn/add_company.aspx.vb b/inn/add_company.aspx.vb
index e90f7e3..c89b1aa 100755
--- a/inn/add_company.aspx.vb
+++ b/inn/add_company.aspx.vb
@@ -461,9 +461,10 @@ Public Class addcompany
         strLetterToMasterUser = Replace(strLetterToMasterUser, "ksjghfiw6", strMasterUserPassword)
 
 
+        Dim smtpPort As Integer = CInt (My.Settings.ratord_SMTP_port)
         Dim strEmailReturn As String = SendSimple(My.Settings.ratord_SMTP_email,

rolfbjarne

Process:               com.xamarin.monotouch-test.watchkitapp.watchkitextension [97956]
Path:                  /Users/USER/Library/Developer/CoreSimulator/Devices/5433127F-9E60-4117-9D04-966DBBA205C4/data/Containers/Bundle/Application/9C3DFB9C-63C3-4F89-92C1-CF0D77EBE3C9/com.xamarin.monotouch-test.watchkitapp.app/PlugIns/com.xamarin.monotouch-test.watchkitapp.watchkitextension.appex/com.xamarin.monotouch-test.watchkitapp.watchkitextension
Identifier:            com.xamarin.monotouch-test.watchkitapp.watchkitextension
Version:               1.0
Code Type:             X86 (Native)
Parent Process:        launchd_sim [97840]
Responsible:           com.xamarin.monotouch-test.watchkitapp.watchkitextension [97956]
User ID:               501

Date/Time:             2016-01-13 12:49:51.736 +0100

rolfbjarne

diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
index be57350..f6df138 100644
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -6454,34 +6454,45 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
 
 		if (!strcmp (cmethod->name, "Read") && fsig->param_count == 1) {
 			guint32 opcode = 0;
+<<<<<<< HEAD
 			gboolean is_ref = mini_type_is_reference (cfg, fsig->params [0]);

rolfbjarne

<div>
<style scoped>
	.nonbreaking { color: black; }
	.breaking { color: red; }
	.obsolete { color: gray; }
	.added { color: green; }
	.removed-inline { text-decoration: line-through; }
	.removed-breaking-inline { color: red;}
	.added-breaking-inline { text-decoration: underline; }
</style>

rolfbjarne

diff --git a/iOS/GlobeView.cs b/iOS/GlobeView.cs
index 93f1565..08c7f91 100755
--- a/iOS/GlobeView.cs
+++ b/iOS/GlobeView.cs
@@ -98,12 +98,14 @@ namespace HelloWorld.iOS
 			}
 		}
 
+		static List<CGDataProvider> providers = new List<CGDataProvider> ();
 		public static IImage LoadImage (System.IO.Stream stream)