On Fri, Jul 8, 2011 at 12:02 PM, <[email protected]> wrote: > Branch: refs/heads/master > Home: https://github.com/Warzone2100/warzone2100 > > Commit: 793c30a862627427282630bed87af8a3774bf719 > > https://github.com/Warzone2100/warzone2100/commit/793c30a862627427282630bed87af8a3774bf719 > Author: Rene Jochum <from_github@xxxx> > Date: 2011-07-08 (Fri, 08 Jul 2011)
> > Log Message: > ----------- > Merge branch 'bsonlobby' into master > > Conflicts: > macosx/Warzone.xcodeproj/project.pbxproj A heads up would have been nice before the merge, this touched a lot of things, and changes things around, and requires new libs. The bigger problem is, that commit message tells us nothing. What does this patch do, how are things changed, and what the new files (*.pem) will be used/generated for, and finally, a bit more info on the SSL connections and connections that don't use that ? Oh, speaking of SSL, is the master server's code ready on that end ? It also seems like you didn't pull in master and rebase your patch on top before the push. The graph looks pretty screwy now, since you didn't rebase when you tried to pull in some past checkouts. _______________________________________________ Warzone-dev mailing list [email protected] https://mail.gna.org/listinfo/warzone-dev
