From 7a7f29825d20846767f2d9ea243f819094d89e9c Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 19 Dec 2021 19:16:09 +0100
Subject: [PATCH] Bumped the version to 1.2.0-dev

---
 es-app/CMakeLists.txt                        |   2 +-
 es-app/assets/EmulationStation-DE_Info.plist |   2 +-
 es-app/assets/emulationstation.6.gz          | Bin 962 -> 963 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 897f933e0..e7d8bb974 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-rc")
+set(CPACK_PACKAGE_VERSION "1.2.0-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 07d0bb8f3..402c08ddb 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-rc</string>
+    <string>1.2.0-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 9456ab4e4b0cd8e20a8121a1689900409f7a14a1..74656f4182d477bbd9f8b0876f11448f8bf5b755 100644
GIT binary patch
delta 798
zcmV+(1L6F_2g3&jABzYGmv)f`w0}^rJ!=1;Ez<)Mrgv~ZT}0#u>j0v&C_Ra0Oz({B
zAS$?fdvN;gK3S%5O2RMj+6Q^e$~e1{otI_ftXyq8Xcncvui~ZSPW~?n45KudMI+!E
zD3nSH!$bk4RIpX@pt-1kqM)Hx<h6TME;VP_!ckfU7{KtL!zc)9y&7`aG=D62{zF1y
z^FagmezELE!j^&6_>&7X6n~*(&*Z>OeM(X)4cg{4V8=|&V8x7*Q-y+DDyFed%O&x-
zCO%E9&w5F+@=F$ELBTb$Ibu2Bkz>p!m}J4n4Vm@waVrJK2#yKTxJ06B*;q%$gAcqg
z^#&em#;e+F$h7Mkp7&*ZHh;Zzu-8YCd+cP4Mi}IJEX#63)>aAlnxYnZIZ9zzu##f+
zT<xV8T{>#%6M9p$_0BZ^hi%A$KEc=3ba5gML#$uRwtRauOpmatSbqlkK)Vk6bm>jV
zEO5E&8r_kZ6dw%eS{{6Ddj;rRF(#m}$~75BOc~o<I&qC{xHefJMStU}OVS<hfLbG4
ztV!N?ew8dhGm5Rc0%wPXqD4O~X9wX^+gv*4l|bSb0nl~qWuD(z3?*-H@P?RrX&XPG
zI23k^!dgm$tY1{n<(CCDFA65Iz+*jUmv%2bIi!Bvn}R9*KHd-gYrGd;Vvtjgi6Fhk
z+1|RR&*344Ru;^4?td1QZ(w#@>fO7bKb`hXRPi5};td2Boy8X7-j%$1#`bTk`r(!(
zcssyj#`6~|Qp=Y4nd~U;2JV!?J(ucu9!gwTX97<BVkz0y`glv6FXtGa7{r|n`ok7s
zEBYP00x#P8vF+CvPTKdt?xsH@{lKTT#hu6VrkOAtKUdiF%71aTTk5aK^kIFMtjL_9
zS!#|oj^6O~p~Psr5qz$V>GY@Zm}$%@l&Tv4Mu@*pOYZ8}wieIJ5r*Go9!SU(FCxrk
z`L}h$Jd}!8T+rs6&&U%Qq)`OZd72D}8x$yHZd+vB_r=}lJ>?C>p$BR{J+rB}L1~EL
c#|?A;5H5%D>koenWQ=V81p>Y`&L{@}05#2y9smFU

delta 797
zcmV+&1LFL{2f_yiABzYGTRf2lw11#-RQ^F*rUxWU@8EvAh{zAd0Yqm}dJ@f;-Wl0J
zRB-q9;Pl&lvP|QYgkRvb5Av9madss;FU!VRx!QQpEJ}Z0#Y;z>{9hCpMrkmMM!+>t
zD3uh3i2_QgV5{Uob5Q|BK|`&`Yxk;LYR<BSqqGVzfZ;)hQ4rL6HRQ5sSby&PhlIrD
zg9h&XV%3d=Ed#6ZCl_ca{zAu|$$^{tl%!M|w9RY4hMAhdiWw!R3I(}TOk<mtOX71)
ze41FF^^#=emn_JFf@@@R#B#tR$Cytr$%2m?GVA5zRtk<0922B*iA2}3v5t%fA9!Kv
z4LsJ2SGC!YY1cJ8@5}gXdVlF)ua6@4*vS};Fv#^-mgR=5trGAxMJ@Dll)|uJCB^Ew
z+DkFIbkx!(^rmR*ooW6L+mHo)g0HLT;zS&VSihES`Sxg-9${6n{tWbib{+QV(wmT3
z;BwbBx+60wJ{ZuoJowu73edS?Oh93kYch_QGPb*P;u_m<ZL&a$#(!0pq&waLwMMpB
zlf3WzDp`PL6kBx#&JGJji+)<p4#KClxpd4cfy6HYpzGMnJioITO5Wh$4Kel7Hhw~J
zDC`!6wUh=~zo?+gFAHj36ij4+$9m2#?Ou9vNd34s1ylNcydV14crU!fAg3G?L3)j|
zy>(BY!$S<MEST%uEq^NC!0foxyLUl<I_;aN;y*CO8wf5si!H>xD|z*d?cY}Q!!1kj
zc2KZA&tI%aEnDVivZJ^gxKj%ET&m-FC~;w(2{`qOrDR*{<1KN%oMU`q5O*@@4_kz-
z=y&i6ylC&owqIX3Y2O38lm3kK1E1O!cOK81X2Nj%Tw&8I$A8&wslOuAhxJ{uB6Egj
zsX5j-dc)U;5~J-#@VPdo)1Ss;rZJ~bs%rcjA^tusxvOK_T0AdD7=D*|AR$w{h%lGs
z-_{NDP%2(=L7Q_vBTr<IMiETsX)+*gP@s^xZIN-`7k8ugls6QI9;o^B%%<W7r6GnN
bH_ZJ*xE#i>{|+&bF|z#^3@DVECkFrkQJj%q

diff --git a/es-app/src/EmulationStation.h b/es-app/src/EmulationStation.h
index 287a3af74..23f8e802c 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-rc"
+#define PROGRAM_VERSION_STRING "1.2.0-dev"
 
 #define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__