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 /CHANGELOG | |
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 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -4,14 +4,17 @@ Version 2.7 jesuspezuna, joe, joetuxedo, kerberos, manticore, meadowsong, pinkiegummydisguise, seaswirl, theodoredonaldkerabatsos, turf, waltercoltchak - New extraponies: blueballblitz (Various fanfics, Shadowbolt), drhooves1, drhooves2, - drhooves3, drhooves4, drhooves5, drhooves6, drhooves7, drhooves8, - drhooves9, drhooves10, drhooves11, pinkaminacupcake (Fanfic) + New extraponies: blueballblitz (Various fanfics, Shadowbolt), drhooves1, drhooves2, drhooves3, + drhooves4, drhooves5, drhooves6, drhooves7, drhooves8, drhooves9, drhooves10, + drhooves11, nyx (Fanfic: Past Sins), nyxdisguised (Fanfic: Past Sins), + pinkaminacupcake (Fanfic) + + Pony renamed: cracky to crackle Version 2.6 - New ponies: applebloomdance, blueberry, blueberrycake, blueharvest, candylicious, + New ponies: applebloomdance, blueberry, blueberrycake, blueharvest, candylicious, cherrycola, cracky, cutiemarkcrusaders, derpybags, derpycloud, firestreak, hughjelly, lemonhearts, lyrabonbon, noi, pictureperfect, pigpen, poppycock, quickfix, rainbowhurricane, rainboshadowbolt, silverspeed, |