Mercurial > hg > gcmultimerge
diff speksi.txt @ 108:7677c4992381
Merged.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 18 Oct 2016 12:24:44 +0300 |
parents | c0e97f27f929 |
children |
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 18 Oct 2016 12:24:44 +0300 |
parents | c0e97f27f929 |
children |