From: Victor Wagner <vitus@wagner.pp.ru>
Date: Sat, 5 Sep 2015 20:42:57 +0000 (+0300)
Subject: Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=fiction%2Fjasmina.git;a=commitdiff_plain;h=52546818fc51a1b64bd08ee49d7ac664d0a5fa40

Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
---

52546818fc51a1b64bd08ee49d7ac664d0a5fa40
diff --cc order.lst
index b561b3c,c42c7b7..43fceb3
--- a/order.lst
+++ b/order.lst
@@@ -36,8 -36,8 +36,9 @@@ benares-battle.tx
  patna.txt
  intelligence2.txt
  factory.txt
+ weavwers.txt
  truck.txt
 +weavers.txt
  fleet.txt
  embassy.txt
  chess.txt