author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
Tue, 26 Jul 2016 10:50:36 +0000 (12:50 +0200) | ||
committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
Tue, 26 Jul 2016 10:50:36 +0000 (12:50 +0200) |
1 | 2 | |||
---|---|---|---|---|
src/daemon/meta_data.c | patch | | diff1 | | diff2 | | blob | history |
src/network.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/daemon/meta_data.c
Simple merge
diff --cc src/network.c
Simple merge