git://developer.intra2net.com / libi2ncommon / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7fcfa4 fe0be5a)
Merge branch 'proxy-time-profiles'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 3 Mar 2011 09:36:52 +0000 (10:36 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 3 Mar 2011 09:36:52 +0000 (10:36 +0100)
Conflicts:
generate/test/Makefile.am


Trivial merge
libi2ncommon: Common functions used in Intra2net programs