summaryrefslogtreecommitdiff
path: root/makediff.sh
diff options
context:
space:
mode:
authormstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>2014-08-31 12:29:27 +0000
committermstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>2014-08-31 12:29:27 +0000
commit67dd3ce93a72391a74c9d1c0ab830ed68730d2a1 (patch)
tree0b8583fd1390061e65363bf339c18db54a363563 /makediff.sh
parenta02605f9945f450ecaadf86736741de2e2c2e788 (diff)
makediff: mask more changelog changes
git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio@427 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
Diffstat (limited to 'makediff.sh')
-rwxr-xr-xmakediff.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/makediff.sh b/makediff.sh
index 0005612..1960dbd 100755
--- a/makediff.sh
+++ b/makediff.sh
@@ -13,6 +13,9 @@ git cherry-pick 42ef1dd895681a9b387d2c624771f1784c42a3d8
#suppress diff of changelog
git cherry-pick 2cf864d5659977040fdbc7a60f5e0530611f71da
git cherry-pick 523d7d957f4cd93c8b58a24f6bb6a3b4d64d0b99
+git cherry-pick de0a207286c4a53cc687e1c1a3409000d38be937
+git cherry-pick a279f7f7fcce55a00c4e419114f5171912ab17ae
+
#mv specvars.tex specvars-orig.tex
#make links green to avoid confusion