1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-24 08:29:04 +00:00

Merge changes from Nmap 7.80 release branch

This commit is contained in:
dmiller
2019-08-11 05:30:19 +00:00
parent 0b49f7f933
commit f05296d7f7
14 changed files with 454 additions and 328 deletions

6
nmap.h
View File

@@ -195,13 +195,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.70SVN"
#define NMAP_NUM_VERSION "7.0.70.100"
#define NMAP_VERSION "7.80"
#define NMAP_NUM_VERSION "7.0.80.0"
#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.70"
#define NMAP_UPDATE_CHANNEL "7.80"
#define NMAP_XMLOUTPUTVERSION "1.04"