Merge branch 'develop' into debian-develop

[archipelago] / src / common.h

diff --git a/xseg/peers/user/common.h b/src/common.h
similarity index 100%
rename from xseg/peers/user/common.h
rename to src/common.h