Rebase against 56959b18085ea22050d0226f669f112abfb37850.

This commit is contained in:
Sebastian Lackner 2017-01-03 09:19:01 +01:00
parent 11313c0788
commit cb8a0d2ffd
2 changed files with 2 additions and 2 deletions

View File

@ -918,7 +918,7 @@ index 6dbf8c0..9a9fe47 100644
+
+-----------------------------------------------------------------------
+
Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS
Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS
for a complete list)
Wine is free software; you can redistribute it and/or modify it under

View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "80d2edd5845c09b98cb5b6b7779b4455dfbc1095"
echo "56959b18085ea22050d0226f669f112abfb37850"
}
# Show version information