Re: TypeCode operations



Murray Cumming <murrayc@t-online.de> wrote:
> Sam, can you add these changes to ORBit2 HEAD also, assuming that the
> maintainers agree? It's causing a problem when I try to merge HEAD into
> cpp.

I can do that if necessary, but when I first committed these to the cpp
branch, I asked if they should go in HEAD and was told no, at least not
for now.

So I'd need Michael or Mark to say so, and I can do it.

Out of interest, what kinds of problems are you seeing when trying to
merge? I don't think corba-typecode.c has changed in HEAD, so there
shouldn't be any conflicts in that file, at least.
-- 
Sam "Eddie" Couter  |  mailto:scouter@bigpond.net.au
Debian Developer    |  mailto:eddie@debian.org
                    |  jabber:sam@jabber.topic.com.au
OpenPGP fingerprint:  A46B 9BB5 3148 7BEA 1F05  5BD5 8530 03AE DE89 C75C

PGP signature



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]