From 7223994aa6162a56d71add8d1a6edf023266b818 Mon Sep 17 00:00:00 2001
From: fincs <fincs.alt1@gmail.com>
Date: Tue, 22 May 2018 00:49:24 +0200
Subject: [PATCH] Release v1.2.1

---
 Changelog.md | 9 +++++++++
 nx/Makefile  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index db5af7faa..52eb54700 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 1.2.1
+
+* Added hidMergeSingleJoyAsDualJoy.
+* Added setGetSerialNumber.
+* Renamed the JIT syscalls to match their official names.
+* Fixed bug in nvgfxEventWait that prevented the graphics subsystem from working on certain conditions.
+* Fixed JIT support on 5.0.0+ by falling back on JitType_CodeMemory.
+* Further improvements to overall system stability and other minor adjustments to enhance the user experience.
+
 ## Version 1.2.0
 
 #### filesystem
diff --git a/nx/Makefile b/nx/Makefile
index 63a15ccf9..40e3ef976 100644
--- a/nx/Makefile
+++ b/nx/Makefile
@@ -10,7 +10,7 @@ include $(DEVKITPRO)/devkitA64/base_rules
 
 export LIBNX_MAJOR	:= 1
 export LIBNX_MINOR	:= 2
-export LIBNX_PATCH	:= 0
+export LIBNX_PATCH	:= 1
 
 
 VERSION	:=	$(LIBNX_MAJOR).$(LIBNX_MINOR).$(LIBNX_PATCH)