From 81361af7b69a00148aa8de484afb433101a88474 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Tue, 19 May 2015 15:21:31 +0200
Subject: [PATCH 1/2] Rcpanel hot fix (Roll can't move)

---
 ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml
index b61fe6c8c..09b5f61bd 100644
--- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml
+++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml
@@ -379,7 +379,6 @@ Item {
         width: scaledBounds.width * sceneItem.width
         height: scaledBounds.height * sceneItem.height
 
-        x: (scaledBounds.x * sceneItem.width) + (ManualControlCommand.Roll * rc_stick.width * 2.5)
         y: (scaledBounds.y * sceneItem.height) + (ManualControlCommand.Pitch * rc_stick.width * 2.5)
 
         smooth: true
@@ -394,7 +393,7 @@ Item {
         states: State {
              name: "fading"
              when: show_panels == true
-             PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) + offset_value; }
+             PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) + (ManualControlCommand.Roll * rc_stick.width * 2.5) + offset_value; }
         }
 
         transitions: Transition {

From 364409a3670083641cf2267512ac55e01cb624a1 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Tue, 19 May 2015 20:37:31 +0200
Subject: [PATCH 2/2] 15.05 Update contributors

---
 CREDITS.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CREDITS.txt b/CREDITS.txt
index b5f7f316a..4bcec3caa 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -20,9 +20,11 @@ Stefan Cenkov
 Andrés Chavarría Krauser
 Cosimo Corrado
 James Cotton
+Kalyn Doerr
 Steve Doll
 James Duley
 Piotr Esden-Tempski
+Steve Evans
 Peter Farnworth
 Ed Faulkner
 Andrew Finegan
@@ -50,6 +52,7 @@ Stefan Karlsson
 Ricky King
 Thorsten Klose
 Karl Knutsson
+Daniël Koek
 Sami Korhonen
 Hallvard Kristiansen
 Alan Krum