git://developer.intra2net.com / libi2ncommon / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae45fb9 55661be)
Merge branch 'master' into squid-v3
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Mon, 11 May 2009 15:39:51 +0000 (17:39 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Mon, 11 May 2009 15:39:51 +0000 (17:39 +0200)
Conflicts:
libcnfcheck/src/check_var/cnfcheck_proxy.cpp
libcnfcheck/src/check_var/cnfcheck_system.cpp
libfirewall/src/fw_ruleset_obj.cpp
libfirewall/src/fw_ruleset_obj.hxx
packages/squid/squid.spec


Trivial merge
libi2ncommon: Common functions used in Intra2net programs