On Wed, 2011-09-07 at 11:22 +0200, Ramshankar wrote: > Once it's ready could you also upload a diff somewhere that can be > applied. I presume there will not be many merge conflicts because most > out if should be added files under Additions/haiku/* Not (yet) a merge conflict, but see changeset 38648 [1]. There may be an actual conflicting change which would also affect VbglR3SetGuestCaps coming up there in the next few days too.
Regards, Michael [1] http://www.virtualbox.org/changeset/38648 -- ORACLE Deutschland B.V. & Co. KG Michael Thayer Werkstrasse 24 VirtualBox engineering 71384 Weinstadt, Germany mailto:michael.tha...@oracle.com Hauptverwaltung: Riesstr. 25, D-80992 München Registergericht: Amtsgericht München, HRA 95603 Komplementärin: ORACLE Deutschland Verwaltung B.V. Hertogswetering 163/167, 3543 AS Utrecht, Niederlande Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697 Geschäftsführer: Jürgen Kunz, Marcel van de Molen, Alexander van der Ven _______________________________________________ vbox-dev mailing list vbox-dev@virtualbox.org http://vbox.innotek.de/mailman/listinfo/vbox-dev
