Merge branch 'master' of https://github.com/drk1wi/portspoof into GITHUB_master

Conflicts: src/Configuration.cpp src/Fuzzer.cpp
2013-08-06 14:49:59 +02:00 · 2013-08-06 14:49:59 +02:00 · 6a93941c1c
parent 0c34624ffd 0987aca22f
commit 6a93941c1c
2 changed files with 1 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -3,3 +3,4 @@ compiler:
  - gcc
 # Change this to your needs
 script: ./configure && make
+
--- a/src/Threads.h
+++ b/src/Threads.h