From 1767af8caa52e8fe992621c0b11a2560e26289cb Mon Sep 17 00:00:00 2001
From: Matt Godbolt <matt@godbolt.org>
Date: Wed, 5 Apr 2017 07:58:35 -0500
Subject: [PATCH 1/5] Credit Kalray for their lending of Gabriel

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 313b0873..8d20fc91 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,8 @@ There's now a [Road map](Roadmap.md) that gives a little insight into future pla
 ### Credits
 
 Compiler Explorer is maintained by [Matt Godbolt](http://xania.org) and [Rubén](https://github.com/RabsRincon).
-Multiple compiler and difference view initially implemented by [Gabriel Devillers](https://github.com/voxelf). 
+Multiple compiler and difference view initially implemented by [Gabriel Devillers](https://github.com/voxelf),
+while working for [Kalray](http://www.kalrayinc.com/).
 
 ### RESTful API
 

From cba7508a322763de416e2409f619c18da0d4f659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n?= <rubrinbla@gmail.com>
Date: Fri, 7 Apr 2017 17:27:34 +0200
Subject: [PATCH 2/5] Surname

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8d20fc91..888ef04b 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ There's now a [Road map](Roadmap.md) that gives a little insight into future pla
 
 ### Credits
 
-Compiler Explorer is maintained by [Matt Godbolt](http://xania.org) and [Rubén](https://github.com/RabsRincon).
+Compiler Explorer is maintained by [Matt Godbolt](http://xania.org) and [Rubén Rincón](https://github.com/RabsRincon).
 Multiple compiler and difference view initially implemented by [Gabriel Devillers](https://github.com/voxelf),
 while working for [Kalray](http://www.kalrayinc.com/).
 

From a241b2d8939dbb4c7697b437a3c9880b7ea0164a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n?= <rubrinbla@gmail.com>
Date: Fri, 7 Apr 2017 17:28:03 +0200
Subject: [PATCH 3/5] Safari fix. Closes #371

---
 static/explorer.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/static/explorer.css b/static/explorer.css
index a2d2641d..3a7b02b9 100644
--- a/static/explorer.css
+++ b/static/explorer.css
@@ -10,6 +10,11 @@
     margin-left: 0;
 }
 
+/* TEMP HACK: https://github.com/Microsoft/monaco-editor/issues/408 */
+.monaco-editor .monaco-editor-hover {
+    animation: none !important;
+}
+
 .navbar {
     border-radius: 0;
     margin-bottom: 2px;

From 335b5707bcab4088211dd7f5414fb4194494f843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n?= <rubrinbla@gmail.com>
Date: Sat, 8 Apr 2017 07:39:50 +0200
Subject: [PATCH 4/5] Fix for "Cannot read property 'address' of undefined". If
 there is no assembly for the current line, return instead of trying to access
 undefined

---
 static/compiler.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/compiler.js b/static/compiler.js
index 9dea876b..ef8045eb 100644
--- a/static/compiler.js
+++ b/static/compiler.js
@@ -274,6 +274,7 @@ define(function (require) {
 
     Compiler.prototype.getBinaryForLine = function (line) {
         var obj = this.assembly[line - 1];
+        if (!obj) return '<div class="address">????</div><div class="opcodes"><span class="opcode">????</span></div>';;
         var address = obj.address ? obj.address.toString(16) : "";
         var opcodes = '<div class="opcodes" title="' + (obj.opcodes || []).join(" ") + '">';
         _.each(obj.opcodes, function (op) {

From bc33ca749313268baf4c86b7d72ec462ba31373f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n?= <rubrinbla@gmail.com>
Date: Sat, 8 Apr 2017 07:53:19 +0200
Subject: [PATCH 5/5] That semicolon was not needed

---
 static/compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/compiler.js b/static/compiler.js
index ef8045eb..17d46d04 100644
--- a/static/compiler.js
+++ b/static/compiler.js
@@ -274,7 +274,7 @@ define(function (require) {
 
     Compiler.prototype.getBinaryForLine = function (line) {
         var obj = this.assembly[line - 1];
-        if (!obj) return '<div class="address">????</div><div class="opcodes"><span class="opcode">????</span></div>';;
+        if (!obj) return '<div class="address">????</div><div class="opcodes"><span class="opcode">????</span></div>';
         var address = obj.address ? obj.address.toString(16) : "";
         var opcodes = '<div class="opcodes" title="' + (obj.opcodes || []).join(" ") + '">';
         _.each(obj.opcodes, function (op) {