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

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

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

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

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

index 930e32ac9b3d58887774047c3f080375718a6113,7993a895ef2c40fd70c92fca733e629cfbbfe044..36fe770fb69aa347c33f1f78e4369467c0ae29fb
--- 1/README
--- 2/README
+++ b/README
@@@ -1,2 -1,2 +1,2 @@@
   This is a completely unimportant file.
- And another very important commit...
- -And another unimportant commit...
++Resolved version.
author	Martin Mares <mj@albireo.ucw.cz>
	Thu, 9 Feb 2006 14:14:11 +0000 (15:14 +0100)
committer	Martin Mares <mj@albireo.ucw.cz>
	Thu, 9 Feb 2006 14:14:11 +0000 (15:14 +0100)