Skip to content

Commit 8e1900b

Browse files
committed
Merge branch 'xml-builder-review' of github.com:commoncriteria/mobile-device into xml-builder-review
2 parents 7000e86 + f6bb319 commit 8e1900b

File tree

2 files changed

+11140
-2488
lines changed

2 files changed

+11140
-2488
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
TRANS?=transforms
44
#BASE=mobile-device
55

6-
DIFF_EXE = diff -W 180 -y <(pandoc -f HTML -t markdown "$1") <(pandoc -f HTML -t markdown "$2") >$3
7-
DIFF_EXT = txt
6+
#DIFF_EXE = diff -W 180 -y <(pandoc -f HTML -t markdown "$1") <(pandoc -f HTML -t markdown "$2") >$3
7+
#DIFF_EXT = txt
88

9-
DIFF_TAGS=v3.2
9+
DIFF_DIR=diff
10+
DIFF_TAGS=master
1011
include $(TRANS)/Helper.make
1112

0 commit comments

Comments
 (0)