Module: sip-router Branch: janakj/bdb Commit: 0314e282b3db2ca61dfacc7bde5fb17a5004e573 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0314e282...

Author: Jan Janak jan@iptel.org Committer: Jan Janak jan@iptel.org Date: Thu Feb 19 11:12:08 2009 +0100

Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into bdb

* 'master' of ssh://janakj@git.sip-router.org/sip-router: (176 commits) Make km_sources compile, part two. Link with libkmi, sources from kamailio use the management interface. Make km_ sources compile: Link also with libsrdb1 Added prefix km_ to locally included header files. Align defines protecting header files with filenames. Remove km_Makefile and km_README. Integrate functions and parameters from kamailio sources. Ignore emacs backup and lock files. Various changes to get rid of conflicts and make km_ files compile. Fixed matching of db flags names at the beginning of line. Two small fixes in regular expressions. Module renamed to db_postgres. Merged contents of km_Makefile (namely pg_config autodetection). Removed km_Makefile and km_README. Updated filenames of locally includede header files Align defines protecting headers with filenames. Link with both srdb1 and srdb2 SER to sip-router module conversion script. Kamailio to sip-router module conversion script. ...

---