Module: sip-router Branch: master Commit: 69f3a24eea65fb7663a0910f63239787327c3488 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69f3a24e...

Author: Andrei Pelinescu-Onciul andrei@iptel.org Committer: Andrei Pelinescu-Onciul andrei@iptel.org Date: Thu Apr 23 14:33:37 2009 +0200

Merge commit 'origin/ser_core_cvs'

* commit 'origin/ser_core_cvs': tcp: added missing blacklist on write pollerr makefiles: minor fix (use COREPATH in Makefile.targets) makefile: config and modules.lst minor fixes makefile.doc: support all targets and dep. fixes doc (INSTALL): minor make update makefiles: fixes and speed-ups makefiles: typo fixed

Conflicts: Makefile.doc Makefile.rules Makefile.targets

---