Rebase against bc357819296594aca300fdf30bb0cda46e9f0be0.

This commit is contained in:
Sebastian Lackner 2016-03-22 03:18:07 +01:00
parent ffad0e5c7b
commit 90842489d6
3 changed files with 618 additions and 556 deletions

View File

@ -51,13 +51,13 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "6bc0ce26a853b51f11958545bfa5570bdcb1cf01"
echo "bc357819296594aca300fdf30bb0cda46e9f0be0"
}
# Show version information
version()
{
echo "Wine Staging 1.9.6"
echo "Wine Staging 1.9.7 (unreleased)"
echo "Copyright (C) 2014-2016 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"

View File

@ -1 +1 @@
Wine Staging 1.9.6
Wine Staging 1.9.7 (unreleased)