From a3561f4c889592eafa4e01b4d39f680f0bedf0fa Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Tue, 28 Dec 2021 11:27:01 +0100
Subject: [PATCH] Bumped the version to 1.2.0

---
 es-app/CMakeLists.txt                        |   2 +-
 es-app/assets/EmulationStation-DE_Info.plist |   2 +-
 es-app/assets/emulationstation.6.gz          | Bin 963 -> 960 bytes
 es-app/src/EmulationStation.h                |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index e7d8bb974..4fd1eeecc 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -285,7 +285,7 @@ endif()
 set(CPACK_PACKAGE_VENDOR "Leon Styhre")
 
 # Update this when there has been a new release.
-set(CPACK_PACKAGE_VERSION "1.2.0-dev")
+set(CPACK_PACKAGE_VERSION "1.2.0")
 
 # Use the shorter x64 descriptor if on the x86_64/AMD64 architecture.
 if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL AMD64)
diff --git a/es-app/assets/EmulationStation-DE_Info.plist b/es-app/assets/EmulationStation-DE_Info.plist
index 402c08ddb..125bef9af 100644
--- a/es-app/assets/EmulationStation-DE_Info.plist
+++ b/es-app/assets/EmulationStation-DE_Info.plist
@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleVersion</key>
-    <string>1.2.0-dev</string>
+    <string>1.2.0</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.14.0</string>
     <key>LSUIPresentationMode</key>
diff --git a/es-app/assets/emulationstation.6.gz b/es-app/assets/emulationstation.6.gz
index 74656f4182d477bbd9f8b0876f11448f8bf5b755..5e2d7c0129872d6dacb840819247b945844cf0e7 100644
GIT binary patch
delta 321
zcmV-H0lxmj2fzmhABzYGLgvbm2eJ`0YW|=t(*qKwcW^&lMC1p{k<Bv!O_KouL@MM)
z!j^&6_>&7X6n~*(&*Z>OeM(X)4cg{4V7E-oV8x7*Q-y+DDyFeVvu^=!0e>jip64%C
zq?Rr7Guctx4csY(doI=SJe0Vw&IFwL#Zt1Z_3@TCU(PW;F^D@E^oK3NR`fe~1zxoG
zW81GUoV4$O-93Ls`hibvi#w0!O*3IQey*_TmE&x;)L)V5!}=~+kvT)N)EsLZz2WOa
ziP3f=_*@&)=}+S^)0k5zRc1B*jSzpImfY2`Z7rUcBMiUGJdltnUPPG7@^9;gc_<aH
zxS-8BpOGgrNTUd*^E4R{Hz-iZ+_uQL?~A+9d&(P%Ll4w^dS+8`gVGSgj~nLxAzTjQ
T*Z&yE7}@>{j1Dr$BnJQh$OD|w

delta 323
zcmV-J0lfae2g3&kABzYGmv+CA2eK4(P_R8}|DY|?0}`fpa6er{<Ol1K$}<5@k^V#~
z>_)<tfz|kv3p5mep<~bFz)gKhQYsDF<~3l)OwC}$jFMA@f?O)5u}`yX0dE0+z+=Yq
z7b{ZBmid|NDDDRCl)^oi>UbVXTv%rUPW@sj+1C1aOPnv~7@ru#oecWJ7GW#;9lQcB
z+WWEX*B4IO_rUI^KO_CXr?$nN$MdF{FdRQu*!0SAwp;42$n;@-m#oN~p;>B<HICl!
z^`XRQyAgb@jp_8K@tA4MDU_;a8vjO!zfVi<>e#jx&&v^p-(?<1$P_Ok%w_qvb;CTA
zidS6F=A6&S6B(pY1k-t%42T;PC}eJ1WZd_~-RM2#4aK1cYCb))sklLDh~dW#bN>)7
Vhw<xw3}lRK{{;fRHO?pp003d!q&@%u

diff --git a/es-app/src/EmulationStation.h b/es-app/src/EmulationStation.h
index 23f8e802c..13c7e54cc 100644
--- a/es-app/src/EmulationStation.h
+++ b/es-app/src/EmulationStation.h
@@ -15,7 +15,7 @@
 #define PROGRAM_VERSION_MINOR        2
 #define PROGRAM_VERSION_MAINTENANCE  0
 // clang-format on
-#define PROGRAM_VERSION_STRING "1.2.0-dev"
+#define PROGRAM_VERSION_STRING "1.2.0"
 
 #define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__