head	1.4;
access;
symbols
	branch-boom:1.3.0.2;
locks; strict;
comment	@# @;


1.4
date	2005.07.21.15.31.18;	author harry;	state Exp;
branches;
next	1.3;

1.3
date	2005.04.01.20.47.29;	author harry;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2005.03.29.23.11.45;	author harry;	state Exp;
branches;
next	1.1;

1.1
date	2005.03.23.23.20.09;	author sally;	state dead;
branches;
next	;

1.3.2.1
date	2005.04.01.20.47.29;	author harry;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2005.04.01.23.13.40;	author harry;	state Exp;
branches;
next	;


desc
@@


1.4
log
@merged sally to trunk
@
text
@@


1.3
log
@merged sally to trunk
@
text
@@


1.3.2.1
log
@file file2.txt was added on branch branch-boom on 2005-04-01 23:13:40 +0000
@
text
@@


1.3.2.2
log
@merged trunk to ira
@
text
@@


1.2
log
@merged sally to trunk
@
text
@@


1.1
log
@file file2.txt.py was initially added on branch branch-sally.
@
text
@@