]> mj.ucw.cz Git - libucw.git/commit
Merge branch 'master' into dev-lib
authorMartin Mares <mj@ucw.cz>
Mon, 14 Jul 2008 14:39:04 +0000 (16:39 +0200)
committerMartin Mares <mj@ucw.cz>
Mon, 14 Jul 2008 14:39:04 +0000 (16:39 +0200)
commite287e91134979093e6985c464a6a60ace4ec6e07
tree089b4b5c6fc840bc7032dc285390c9afd7fc33ec
parent23ae8084395d648506e35bac79f4721d15c0fc84
parent76e3cc5962548e62c7fc5e96f43fdb85a3446296
Merge branch 'master' into dev-lib

Merged the dev-admin changes through mainline. Conflicts solved manually:

filter/filter.h
filter/tries.c
lib/Makefile
lib/Makefile