summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>2014-10-19 10:20:05 +0000
committermstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>2014-10-19 10:20:05 +0000
commit8de79427f21fbacb61d9c6b97994808ba9fc6924 (patch)
tree0dbe8a4dfff3d50d97c423650feb0c4154fb63b8
parent9b142d4695f79cd2b7c9ef6be8fb1d87f9bf49c8 (diff)
downloadvirtio-text-tags/v1.0-cs01@435.tar.gz
makediff: fix up to cherry-picksv1.0@435trunk@435tags/v1.0-cs01@435
Signed-off-by: Michael S. Tsirkin <mst@redhat.com> git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio@435 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
-rwxr-xr-xmakediff.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/makediff.sh b/makediff.sh
index 717ef2e..541d6e3 100755
--- a/makediff.sh
+++ b/makediff.sh
@@ -20,7 +20,7 @@ git cherry-pick 2cf864d5659977040fdbc7a60f5e0530611f71da
git cherry-pick 523d7d957f4cd93c8b58a24f6bb6a3b4d64d0b99
git cherry-pick de0a207286c4a53cc687e1c1a3409000d38be937
git cherry-pick a279f7f7fcce55a00c4e419114f5171912ab17ae
-git cherry-pick a4182ff41fa7c5336e8b5137085cf553688a7978
+git cherry-pick 94670c0396844e21dfbe1d8d9d43c60b81ae9790
#mv specvars.tex specvars-orig.tex