From 44b8345fd589e81b871a5e9cdc940c2e20908046 Mon Sep 17 00:00:00 2001
From: Sophie Malla Tatchum <sophie.malla@aims-cameroon.org>
Date: Fri, 3 Nov 2023 12:55:25 +0100
Subject: [PATCH 1/3] Added FlipCoordinates control in the data base

---
 instat/translations/rInstatTranslations.db | Bin 8302592 -> 8302592 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db
index 2d8d33a1844ceaa7429051a8819c228a8f2ad42f..54df330d4313510ca27103637faaf8ab54d2013b 100644
GIT binary patch
delta 765
zcmY+?$xjmj6vy$I>DX3ht7BQDQ~^b$DpmoD;!;~Eipx0e3n~aY2t|<*cMXj(4W8g2
z6Hbj6Zzd!hns};z0LF`n2cz5!2Ti<s@{1mfhfiMe%S+zj{l*u5`NlCB5uK^(wCKF*
z3CWTz*>nA&uc9spf-YIpjDTdld}f<@+Y}+e2N}!YM*u-A$BLqDDzk5D)gOYUP6)<l
z<E`<+Xf`DMqduo+^?L1#=BX1}L$R);IBKvrS16MceVyLVMWxYu9*&vb_i!v4<Zzpu
z7!&^FT6$n8lO4<z%8CB1Mm)8uDJrLPg|IjBUa8NQ<`t;Wpu<22D`8?4!YD&IDo}~l
zs6qtQh++-aq6W37!#b?T(ya~Hh)rlf44bh9ThWMZh+{i;pb5=r!A>O5ie1=^HtfM(
z?8AN}aR4c#(T)ye(20XMgf1M$5gf%aSU3(FCvXy{a2jWD7Uyst7jO~XxP;5Nf*$nZ
zD*DimYq$;v1Gs@f3?YkQ+{7)6;C8VzKiWR(YZYg_K+<(|aZ#L+U&~!mTx=0OdGC^L
zg}2b{M!ngj`^_&17N7o`PIkDJOT~!zt?3L^`9C#jXFi^CaR+0#i+i|_2Y84_c#J2-
Jc<Skg;osr7U#b8A

delta 700
zcmXBNyH8V50D$p(+KWYRdrxVRqJRpDC|JEH1>am+K;@xSRD7UTD6J2Q$i?>~7>6bf
zrpClGI2ac<5)xu=;#B_t)P=;sC?+Px!MHp58HeBW4d2YtAMXqbRU-4WIw3NzQbAq(
z63^$;!LQ=k2W37=hVsdffCpaaD8VxLP>SVP;U+`I+-$9;X+}V4^0Ry^AIlc$F&E8w
zbKI;Cd<iJOD<f`Q(a8E$swv!{qTgaZ)ff%GD3L>>PsY?hbIjHg4_}t6$@fNmzPMn(
zj{r<a1W|?%!YIc|R3L&%tiozkp&B(<gSA+PTGU}ZHsIfDBO0&?o6(3SY(W%Tu?-fQ
zu^l_mf*4xShMm}j-PnV@*oXaShm8)zkw7Q9(2WB)h(qW>FZ$4r!#IKgBykjjIELdm
zfgzm4DV)X`4C5@$;XG2ffDw!$jWJ}9#YJ4gWn95Ha+ttXOyZhbT$t*d^0s;`<+Giv
zslV2HJeK$_3L>U`QtxahqLzl88Z~D-Kh)1br(f^Y+j9Ryq06aM^0!e|Ix;=ckxo~<
d$y;#;)3}ZsxQSc1jXSuDd${jf@dqDse*rH3Pj~<T


From b46eb60df0223ff5e4776308e03b79843731d39f Mon Sep 17 00:00:00 2001
From: Chris Marsh <chris.marsh@idems.international>
Date: Mon, 6 Nov 2023 09:26:47 +0000
Subject: [PATCH 2/3] Add version number back in

Added version number to main form
---
 instat/frmMain.Designer.vb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb
index c994302f7b8..bf79eb90918 100644
--- a/instat/frmMain.Designer.vb
+++ b/instat/frmMain.Designer.vb
@@ -5067,7 +5067,9 @@ Partial Class frmMain
         Me.MainMenuStrip = Me.mnuBar
         Me.Margin = New System.Windows.Forms.Padding(4)
         Me.Name = "frmMain"
-        Me.Text = "R-Instat  .."
+        Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." +
+                My.Application.Info.Version.Minor.ToString + "." +
+                My.Application.Info.Version.Build.ToString
         Me.WindowState = System.Windows.Forms.FormWindowState.Maximized
         Me.stsStrip.ResumeLayout(False)
         Me.stsStrip.PerformLayout()

From 8a5f2a204828ce1a43c569cf0a43241f59febd29 Mon Sep 17 00:00:00 2001
From: Stephen Lloyd <stephen.lloyd03@gmail.com>
Date: Fri, 10 Nov 2023 15:34:18 +0100
Subject: [PATCH 3/3] in script window, implements ?? operator and ensures
 tildas correctly parsed

---
 instat/instat.vbproj   | 4 ++--
 instat/packages.config | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/instat/instat.vbproj b/instat/instat.vbproj
index a8c11a54f20..4c289e05e77 100644
--- a/instat/instat.vbproj
+++ b/instat/instat.vbproj
@@ -155,8 +155,8 @@
     <Reference Include="RDotNet, Version=1.8.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll</HintPath>
     </Reference>
-    <Reference Include="RScript, Version=0.1.0.9, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RScript.1.0.10\lib\net461\RScript.dll</HintPath>
+    <Reference Include="RScript, Version=0.1.0.10, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RScript.1.0.11\lib\net461\RScript.dll</HintPath>
     </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
diff --git a/instat/packages.config b/instat/packages.config
index 5b768929e3d..e6ea1174ecd 100644
--- a/instat/packages.config
+++ b/instat/packages.config
@@ -11,7 +11,7 @@
   <package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" />
   <package id="NLog" version="5.1.0" targetFramework="net461" />
   <package id="R.NET" version="1.8.2" targetFramework="net461" />
-  <package id="RScript" version="1.0.10" targetFramework="net461" />
+  <package id="RScript" version="1.0.11" targetFramework="net461" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net461" />
   <package id="System.Collections.Specialized" version="4.3.0" targetFramework="net461" />
   <package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net461" />