Merge branch 'master' into 1.1

[tinc] / src / ipv4.h

diff --git a/lib/ipv4.h b/src/ipv4.h
similarity index 100%
rename from lib/ipv4.h
rename to src/ipv4.h