]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 867e9a4 73c3d9b)
Merge remote-tracking branch 'stevee/libevent'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Mar 2012 16:56:44 +0000 (17:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Mar 2012 16:56:44 +0000 (17:56 +0100)

Trivial merge
Alex's tree of IPFire 3.x