Merge changes from upstream's version 20190912.

hillwoodroc · Nov 22, 2019 · c3dddb3 · c3dddb3
1 parent f127a0d
commit c3dddb3
Show file tree

Hide file tree

Showing 3 changed files with 609 additions and 168 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6)
 
 set(WINETRICKS_PREFIX /usr)
 set(WINETRICKS_PKGDATADIR ${WINETRICKS_PREFIX}/share/winetricks-zh)
-set(WINETRICKS_VERSION 20181203.2)
+set(WINETRICKS_VERSION 20190912.1)
 
 install(PROGRAMS  winetricks-zh                 DESTINATION ${WINETRICKS_PREFIX}/bin)
 install(FILES     icon/winetricks-zh.svg       DESTINATION ${WINETRICKS_PREFIX}/share/icons/hicolor/scalable/apps)

diff --git a/Changelog b/Changelog
@@ -1,3 +1,9 @@
+-------------------------------------------
+Thu Nov 22 2019 - [email protected]
+
+- Merge changes from upstream's version 20190912
+- Update some apps
+
 -------------------------------------------
 Thu Aug 15 2019 - [email protected]