master
Modify the macosx makefile and add files necessary to build a managed metapackage (.mpkg) installer. The installer lets you pick if you want to install Nmap or Zenmap or both. It puts Nmap in /usr/local and the previously developed Zenmap.app in /Applications.
Use capital letters in package names. The Snow Leopard PackageMaker seems to require that. Without it, I get the warnings
Add Ncat to the package maker XML files.
Merge from /nmap-exp/david/nmap-ndiff and /nmap-exp/david/zenmap-ndiff.
Merge r16779:16804 from /nmap-exp/david/nmap-nping. This adds Nping into the standard distribution.
Reintegrate Nmap 7.90 release branch