diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-09-17 19:24:05 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-09-17 19:24:05 +0200 |
| commit | 140d04b2ca532de5447d64747210f9eb496d6b2e (patch) | |
| tree | 058605b875aa86a8cdc30d6035dcb7391f1e1757 /ttyponies | |
| parent | 3008d6509b61bd0a26af61b0c7e94a06a49bdd94 (diff) | |
| parent | 9f9298d76c441d9dd18eeb9794d6a25058bf477e (diff) | |
| download | ponysay-140d04b2ca532de5447d64747210f9eb496d6b2e.tar.gz ponysay-140d04b2ca532de5447d64747210f9eb496d6b2e.tar.bz2 ponysay-140d04b2ca532de5447d64747210f9eb496d6b2e.zip | |
conflict resolve + typo + m
Diffstat (limited to 'ttyponies')
| -rw-r--r-- | ttyponies/crackle.pony (renamed from ttyponies/cracky.pony) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/ttyponies/cracky.pony b/ttyponies/crackle.pony index 18a3d47..18a3d47 100644 --- a/ttyponies/cracky.pony +++ b/ttyponies/crackle.pony |