]> jfr.im git - irc/freenode/ircd-seven.git/commit
projects / irc / freenode / ircd-seven.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f1e857 717fbca)
Merge branch 'i-like-cheese'
authorJanik Kleinhoff <redacted>
Sat, 2 Dec 2017 10:51:24 +0000 (10:51 +0000)
committerJanik Kleinhoff <redacted>
Sat, 2 Dec 2017 11:51:06 +0000 (11:51 +0000)
commit45d02f75f6dec705c4dc8948db6e51f2855e5828
treefda71696feb33659a530cd046411470d7eef1bbctree | snapshot (tar.bz2 tar.gz zip)
parent1f1e857fe664641b67b61ead71d129b25b22b44ccommit | diff
parent717fbca8dbac5092da6dcfaccdf0062be9b7c04fcommit | diff
Merge branch 'i-like-cheese'

i-like-cheese has seen production use, as has master. The two branches
have diverged a bit. Merge them while they can still be merged without
inducing major headaches.

(There are no conflicts, but some fixes were duplicated.)
libratbox/src/openssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.