head	1.4;
access;
symbols
	VendorB_REL_2:1.1.1.2
	VendorB_REL_1:1.1.1.1
	VendorB:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2007.11.09.21.17.19;	author markus;	state Exp;
branches;
next	1.3;
commitid	UlQ78qN71jQmEWEs;

1.3
date	2007.11.09.21.17.13;	author markus;	state Exp;
branches;
next	1.2;
commitid	Ui7RX8ncQQvkEWEs;

1.2
date	2007.11.09.21.17.11;	author markus;	state Exp;
branches;
next	1.1;
commitid	kfaG15c7GwYjEWEs;

1.1
date	2007.11.09.21.16.48;	author markus;	state Exp;
branches
	1.1.1.1;
next	;
commitid	pfFEihbj6QTbEWEs;

1.1.1.1
date	2007.11.09.21.16.48;	author markus;	state Exp;
branches;
next	1.1.1.2;
commitid	pfFEihbj6QTbEWEs;

1.1.1.2
date	2007.11.09.21.17.12;	author markus;	state Exp;
branches;
next	;
commitid	0dpjMpwVq6hkEWEs;


desc
@@


1.4
log
@last commit on mainline
@
text
@fileB from VendorB - changed
resolved commit
last line for fileB
@


1.3
log
@merged changes from VendorB
@
text
@d3 1
@


1.2
log
@conflicting commit on mainline
@
text
@d1 2
a2 2
fileB from VendorB
conflicting commit
@


1.1
log
@Initial revision
@
text
@d2 1
@


1.1.1.1
log
@Initial import from VendorB
@
text
@@


1.1.1.2
log
@Initial import from VendorB
@
text
@d1 1
a1 1
fileB from VendorB - changed
@

