summaryrefslogtreecommitdiffstats
path: root/NP-VERSION-GEN
diff options
context:
space:
mode:
authorGreg Cox <gcox@fibbsbozza.local>2014-07-29 18:52:12 -0400
committerGreg Cox <gcox@fibbsbozza.local>2014-07-29 18:52:12 -0400
commit4273dd06ff3e52094d6b267d00e8c51dd74de364 (patch)
tree425d127da5dbec7013999ed01b469fc3f72992d9 /NP-VERSION-GEN
parentf05e7016320f4671fbf86cc5abc277efea20f79e (diff)
parent6f3d5825b203b75aef8d68bf0d117e7a1a4c0616 (diff)
downloadmonitoring-plugins-4273dd06ff3e52094d6b267d00e8c51dd74de364.tar.gz
Merge remote-tracking branch 'upstream/master'
Conflicts: plugins/netutils.c
Diffstat (limited to 'NP-VERSION-GEN')
-rwxr-xr-xNP-VERSION-GEN2
1 files changed, 1 insertions, 1 deletions
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN
index ae507e4a..26f94e78 100755
--- a/NP-VERSION-GEN
+++ b/NP-VERSION-GEN
@@ -6,7 +6,7 @@
6SRC_ROOT=`dirname $0` 6SRC_ROOT=`dirname $0`
7 7
8NPVF=NP-VERSION-FILE 8NPVF=NP-VERSION-FILE
9DEF_VER=1.5.git 9DEF_VER=2.0.git
10 10
11LF=' 11LF='
12' 12'