diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
commit | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (patch) | |
tree | 5aad5623d352ec0b4aa245856958c61a384861c7 /src/text.cpp | |
parent | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (diff) | |
parent | 71fe51d38a406012e166589b7b720d83c1ab3ade (diff) | |
download | manaplus-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.gz manaplus-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.bz2 manaplus-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.xz manaplus-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.zip |
Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27
Conflicts:
data/Makefile.am
Diffstat (limited to 'src/text.cpp')
0 files changed, 0 insertions, 0 deletions