17 Apr
2009
17 Apr
'09
11:54 a.m.
This is correct. The commits mentioned below were already on the master
branch and the message below only tells that you merged them in your local
branch.
The change only introduced your new commit and one merge commit, the merge
commit is the one described below.
The commit log message may be a bit misleading in this case, but this is how
it should work.
Jan.
On 17-04 12:23, Juha Heinanen wrote:
looks like something wens badly wrong. i tried to
push a patch to
diaplan module, but also something else got done that i don't know
anything about.
did this undo something that others had done or what? if so, how to fix
it?
-- juha
Module: sip-router
Branch: master
Commit: 2058f9802c7c9f9a53107635c7b181bafdb83c8c
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2058f98…
Author: Juha Heinanen <jh(a)tutpro.com>
Committer: Juha Heinanen <jh(a)tutpro.com>
Date: Fri Apr 17 12:17:37 2009 +0300
Merge branch 'master' of ssh://jh@git.sip-router.org/sip-router
* 'master' of ssh://jh@git.sip-router.org/sip-router:
parser: added METHOD_PUBLISH
registrar: included missing lib/kcore/km_ut.h
textops: added implementation of free_/fixup_regexp_none()
core: commented prototype of free_/fixup_regexp_none()
kex: added module documentation
kex: set dependency on kmi and kcore libs
kex: new module - kamailio extensions
libkmi: moved mi core commands to kex module
mi_fifo: start FIFO listener process using SR interface
---
_______________________________________________
sr-dev mailing list
sr-dev(a)lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
_______________________________________________
sr-dev mailing list
sr-dev(a)lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev