Merge https://github.com/visualboyadvance-m/visualboyadvance-m

src/gba/remote.cpp

@@ -3613,7 +3613,7 @@ void remoteSendStatus()
     s += 12;
     CPUUpdateCPSR();
     v = reg[16].I;
-    sprintf(s, "19:%02x%02x%02x%02x;", (v & 255),
+    sprintf(s, "10:%02x%02x%02x%02x;", (v & 255),
         (v >> 8) & 255,
         (v >> 16) & 255,
         (v >> 24) & 255);

src/sdl/expr.ypp

@@ -4,9 +4,8 @@ namespace std {
 #include <memory.h>
 #include <stdlib.h>
 #include <string.h>
+#include <cstdlib>
 }
-
-using namespace std;
  
 #include "../System.h"
 #include "../gba/elf.h"

src/wx/wxvbam.desktop

@@ -4,7 +4,7 @@ Type=Application
 Name=VBA-M
 GenericName=Game Boy Advance Emulator
 Comment=Nintendo Game Boy Advance Emulator
-Exec=visualboyadvance-m-wx %f
+Exec=visualboyadvance-m %f
 Icon=vbam
 Categories=Game;Emulator;
 Keywords=emulator;Nintendo;gameboy;Game Boy;Game Boy Color;Game Boy Advance;