Merged 68c5970ac0c6 and 158c86910c36
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 03 Nov 2014 12:59:09 +0000
changeset 253 5009da919b17
parent 251 68c5970ac0c6 (current diff)
parent 252 158c86910c36 (diff)
child 255 fc5dbeb704f0
Merged 68c5970ac0c6 and 158c86910c36
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgsub	Mon Nov 03 12:59:09 2014 +0000
@@ -0,0 +1,1 @@
+wiki = wiki
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgsubstate	Mon Nov 03 12:59:09 2014 +0000
@@ -0,0 +1,1 @@
+4368c463015d3bd32d60202a1533005c35ed1642 wiki
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc	Mon Nov 03 12:59:09 2014 +0000
@@ -0,0 +1,1 @@
+wiki
\ No newline at end of file