Mondain wrote:
You dont have to add your apps to the jetty config, that
issue was fixed yesterday.
Great ! yes i just tested it. Ok no problems with that now except for
the problem with my edits to the buid.xml file aswell as the .classpath
file for eclipse. It'll be a stab in the dark for me, but ill try and
tinker with the source to help work out this heap problem aswell, our
main videos are down atm and running the windows media streams only as
backup.
Would there be a source i could revert to which doesnt have this
problem ? we only just discovered it on the weekend and strangely
enough i havent updated for a while so it just randomly happened.
On 10/30/06, Dan Rossi <[EMAIL PROTECTED]
> wrote:
Steven Gong wrote:
On 10/31/06, Dan Rossi <[EMAIL PROTECTED]
>
wrote:
Steven Gong wrote:
On 10/31/06, Dan Rossi <[EMAIL PROTECTED]
>
wrote:
hi
i
know
this isnt appriate, but how is it possible
to merge changes on files that i modify and then become conflicted as
svn adds the <<< mine tags everywhere. let me know.
"<<<" means local changes and ">>>" means changes on
server.
Ok they have to be manually edited ?
I did it manually. :-)
No i meant i have to manually merge and fixup the files, as thats what
i have to do at the moment, take out those added tags even, more
specifically it thinks i made a change to the source when i have to add
my apps to the jetty config so the entire bean setting for the apps in
the jetty conf is within these tags.
_______________________________________________
Red5 mailing list
[email protected]
http://osflash.org/mailman/listinfo/red5_osflash.org
--
The early bird may get the worm, but the second mouse gets the cheese.
_______________________________________________
Red5 mailing list
[email protected]
http://osflash.org/mailman/listinfo/red5_osflash.org
|
_______________________________________________
Red5 mailing list
[email protected]
http://osflash.org/mailman/listinfo/red5_osflash.org
