head	1.2;
access;
symbols
	branch:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2005.12.27.10.46.17;	author ossi;	state tst;
branches;
next	1.1;

1.1
date	2005.12.27.10.44.37;	author ossi;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2005.12.27.10.46.41;	author ossi;	state Exp;
branches;
next	;


desc
@@


1.2
log
@multi-branch-commit
@
text
@file2 rev2 head
@


1.1
log
@adding
@
text
@d1 1
a1 1
file2 rev1
@


1.1.2.1
log
@multi-branch-commit
@
text
@d1 1
a1 1
file2 rev2 branch
@


