1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 22:21:29 +00:00

Merge 7.70 release branch into trunk

This commit is contained in:
dmiller
2018-03-20 18:08:25 +00:00
parent 67f828ca12
commit cadb66231f
32 changed files with 1376 additions and 1362 deletions

6
nmap.h
View File

@@ -190,13 +190,13 @@
#ifndef NMAP_VERSION
/* Edit this definition only within the quotes, because it is read from this
file by the makefiles. */
#define NMAP_VERSION "7.60SVN"
#define NMAP_NUM_VERSION "7.0.60.100"
#define NMAP_VERSION "7.70"
#define NMAP_NUM_VERSION "7.0.70.000"
#endif
/* The version number of updates retrieved by the nmap-update
program. It can be different (but should always be the same or
earlier) than NMAP_VERSION. */
#define NMAP_UPDATE_CHANNEL "7.60"
#define NMAP_UPDATE_CHANNEL "7.70"
#define NMAP_XMLOUTPUTVERSION "1.04"