From 2c421c86e052c8f78986a666444983dedf921136 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sat, 11 Dec 2021 12:01:54 +0100
Subject: [PATCH] Bumped the version to v1.2.0-rc-dev
---
es-app/CMakeLists.txt | 2 +-
es-app/assets/EmulationStation-DE_Info.plist | 2 +-
es-app/assets/emulationstation.6.gz | Bin 964 -> 965 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 fc784f378..48c7b13a6 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-beta3")
+set(CPACK_PACKAGE_VERSION "1.2.0-rc-dev")
# 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 cc0a9af65..6495b7ff0 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-beta3</string>
+ <string>1.2.0-rc-dev</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 4cf5b3e695249c84dbfbaacf90e6edd630cf0fdb..33138df0a7888b4d63ad0e61ff4f4580098dea72 100644
GIT binary patch
delta 942
zcmV;f15y0M2gL^mABzYG)`YZ?2Pc0$wbJQSi7QTH6=H<RNvD_(i@mnD*t_n&K<KaU
z>>4g4m$V-c?94nf&%6?51DGXnpR8e#%;MW`u)d2^xQ*x0PXMuj1JzJ5!4x&Dfb9`#
z)^s;56)*`u{u)kx4oSGagJ|(EpRVKNK3)4S82mDT!Hngs-7*C?*EbV<v(|q$)Nm=Z
z@n5i?gg4=Jpz@$#do=iiwoDI5nBKwtbP<ss00Bg2QF;>1nBE!LK~!+}_Tco}eX>mB
zl!Ra4wGZ-`m2q|@J1@(|S-IMH&@4)SU&TvDpZs4G7)EI@i$=gTP$-oYhKT}7sbH(*
zL32?7ML|QY$ZPkiTx!m;g`<D83NV1-L5EQg)Ot1KvT0cE{D*|Z=7R?A{bJ>fge?QB
z@h2B(DE>mnp2>lm`jn(p8nn%8z^0j+!HO9rrwRqRR7_*5mP_JuO?;YIpY@Vt<(DkT
zf`V&gbHsAMBgdFeFv)_C8#3$V<5mie5gZewafw9Nvaybg2OoH0>J5K9){IxR*^p`1
zH9YUj_-uOVV6TrN_t?o8jWEddSeE66tgRC8HAOA-a+JcbU?s)sx!OxHx^&diC-kOh
z>z!%-58IFheS)v6>Ec8jhFHIrZTa?Sm>ywOvHlG7fp#7C>C&5!S>STlHM%1+DLxp`
zwLJLR_6pFsVoX3`m1}=8j+ipGyL93j+i-2NK#Imym!v!10kuZ9Sd+Z({3=<1W)xd>
z1<no&MT>q~&JMz-wz+i7D}lr>0-)>I%RIlc7)svY;0-bL(l&lVaVYE-g|(ChS-+^D
z%P$LRUKC7Zfya8zF6~}=a!CESHw9DreY_v~*LW|y#2}{}6G4A^jkCRVPoKj>46Q7f
z>)b6W-@xp+)Vp^<e>&}(sNz2`#Ty7NI*TpDy(@Y3jP2i6^}{Vo@OFU5jOQ;_q?Rr7
zGuctx4csY(doI=SJe0Vw&IFwL#Zt1Z_3@TCU(PW;F^D@E^oK3NR`fe~1zxoGW81GU
zoV4$O-C2J|`hkB>ZHqgP=S?$VIDW3M>6PPbx71&e>BIUiS&=zIv(y}G9KGS|Ly6IL
zBluh!)9Fv+G1Hh+C{;E7jSzpImfY2`Z7rUcBMiUGJdltnUPPG7@^9;gc_<aHxS-8B
zpOGgrNTUd*^E4R{Hz-iZ+_uQL?~A+9d&(P%Ll4w^dS)I|af8wj!;c&0{vlir<JbQf
Q$QarF3)~r$Vk-v#0KWF$xc~qF
delta 941
zcmV;e15*6O2gC;lABzYGA$YTq2Pc1bYNb<Ei7QTH6#~NKq*Kg?wY|2t*t_n&K)7Gu
z*)=pIm$V-c?94nf&%6?*1DGx0ez}3gau(lygUwx>z->H_egcRM9H@qh38tuF1!PC4
zS<~ILRKO(s^h-GT7?N;v2hrkTKHbF2`()$4VDR$*1~ZnkHe(8Iu5TvzX03m1sNqs*
z<G)}(32(ydAY+DpMExJMWqLru<PPqqi-`PSA3$^#B`490>79`sL<M(m4^F<_FIP#N
zknjt<_CX%gGET2#=Vj?QE!SHQnnlU)>v-kZlmCkX!zc-6(FnK(3Z;_5Fi}7$6=X^t
zG#3?66g1R|ymqh3rRFSKI7)x300S5vbQlFetye=Xn}+4ie@IAdK4{?HFBaZN$QW3S
zKe<3d@fSMwOb*=CrzEA)plx0Q_RQ1_*32k5RVc`%Vj4TOS`nY?(x-{_*{n!feo2Eg
zD7Z#8M=S?Ca*X)|lQj6WC9_^WZl&ND!7)J^mq>Ii8|%n;@PQYm-ok%l&3ILtEtz&*
z!}Gq3&!(3S_WCGtkDZLs2!mXYWm#^?#wr0{6VyU4M=1;oR#L2<tGyJXOGhnzLT`$;
z-kIj#*_JHm6MS7y7boH{#QL=?<Jr+LJ;JJD{Tb*3?K<q!r8gndz~!!MbVp`Vd@!JE
zdGNLE6`*s)n1I46*JOVjF=cFb>BKd*;o78u6pgDcNp`#gYK?5MCVAia^>P84QEb%}
zI6Ev9E&6FWI|!fJ=F%~*1QNdpfUaXN^Zd?YD0zc}H^kIS+xQ8^p|BYWYbgz~eo;Y}
zUmDcBD40kCkM*2g+P(DTkos|N3a0e?ct7;7@m_d|K~6a)g7kkHXM5|OK8J@GT3ImH
zxm#4ef!T4XckhD!blNvj#eZOmHxOKO7F&pWSMur^+rO>qhg+85?Vw<Lp1)X;TDHv3
zWJhr~aHkaRxm3sVP~yTm6L9JmOUW|p<E?PMoMU`q5O*@@4_kz-=y&i6ylC&owqIX3
zY2O38tNx7i1D}7`7Iz-cn`Xjr{9IwvE63Sp)L)V5!{%<eCUb^ni8<Cddc)U;5~J-#
z@M~>Mr$3L!Ok+-=RMq%5Li~MNaaYH-wRm2RF#K2MfrL!)BEnpje_J=qL#cSh1#Qmx
zj69J+5=AhbC(8kGg93%jZHtWizPKB`r@Wy!^gzw$XEq%bHz*A;{J3H6AHwA@e*KSu
PjFIg>!p_CFDhB`nmeJ5;
diff --git a/es-app/src/EmulationStation.h b/es-app/src/EmulationStation.h
index 12668c7ad..1f875b116 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-beta3"
+#define PROGRAM_VERSION_STRING "1.2.0-rc-dev"
#define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__