/[resiprocate]
ViewVC logotype

Revision 3605


Jump to revision: Previous Next
Author: jason
Date: Tue Nov 23 19:37:34 2004 UTC (15 years, 2 months ago)
Changed paths: 17
Log Message:
svn merge -r 3484:HEAD http://scm.sipfoundry.org/rep/resiprocate/main/sip/resiprocate/dum
merged changes from security work session into branch
one conflict resolved in InviteSession.hxx by keeping branch version


Changed paths

Path Details
Directorybranches/b-teltel-20041118-invitesession/BaseSubscription.cxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/BaseSubscription.hxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/ClientSubscription.cxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/Dialog.cxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/DialogSet.cxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/DialogSet.hxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/DialogUsageManager.cxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/DialogUsageManager.hxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/PublicationHandler.hxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/ServerPublication.cxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/ServerPublication.hxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/ServerSubscription.cxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/ServerSubscription.hxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/SubscriptionHandler.cxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/SubscriptionHandler.hxx modified , text changed
Directorybranches/b-teltel-20041118-invitesession/doc/dum-clientinvite-state.dot modified , text changed
Directorybranches/b-teltel-20041118-invitesession/test/Makefile modified , text changed

webmaster AT resiprocate DOT org
ViewVC Help
Powered by ViewVC 1.1.27