Merge branch 'master' of cvs.ucw.cz:/home/mj/GIT/vcut

author Martin Mares <mj@albireo.ucw.cz>

Thu, 9 Feb 2006 14:15:51 +0000 (15:15 +0100)

committer Martin Mares <mj@albireo.ucw.cz>

Thu, 9 Feb 2006 14:15:51 +0000 (15:15 +0100)
author Martin Mares <mj@albireo.ucw.cz>
Thu, 9 Feb 2006 14:15:51 +0000 (15:15 +0100)
committer Martin Mares <mj@albireo.ucw.cz>
Thu, 9 Feb 2006 14:15:51 +0000 (15:15 +0100)
diff --cc README

index cf15b2969b687ace7dc23101b4e9cdc443d15e6d,293cd06e76fc0412b0320d8204c38b8e34ce4dbc..36fe770fb69aa347c33f1f78e4369467c0ae29fb
--- 1/README
--- 2/README
+++ b/README
@@@ -1,2 -1,2 +1,2 @@@
   This is a completely unimportant file.
- Resolved version. ?
- -Resolved version. Again trying to make a conflict.
++Resolved version.
author	Martin Mares <mj@albireo.ucw.cz>
	Thu, 9 Feb 2006 14:15:51 +0000 (15:15 +0100)
committer	Martin Mares <mj@albireo.ucw.cz>
	Thu, 9 Feb 2006 14:15:51 +0000 (15:15 +0100)