Merge branch 'ip-version-drop'
authorGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Wed, 21 Mar 2012 00:42:14 +0000 (21:42 -0300)
committerGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Wed, 21 Mar 2012 22:42:37 +0000 (19:42 -0300)
commit7c85a84812ca799ceb276138448e1384aca7136f
treec5628979706e26be3cc976532fd6b554e27e3d81
parent681dd2026c1e4d0998000299f1949965ddca4e2d
parent064f747783e54000cd3793f2a913dd9dfb9434c7
Merge branch 'ip-version-drop'

Conflicts:
src/config/host.cpp
src/config/host.h
src/host/pingscheduler.h
src/main.cpp
test/test_configurationcommandline.cpp
test/test_configurationoptions.cpp
12 files changed:
Readme
src/CMakeLists.txt
src/config/host.cpp
src/config/host.h
src/host/pinger.h
src/host/pingscheduler.cpp
src/host/pingscheduler.h
src/icmp/icmppinger.cpp
src/main.cpp
test/test_configurationcommandline.cpp
test/test_configurationfile.cpp
test/test_configurationoptions.cpp