Ver Fonte

Merge branch 'master' of ssh://gitredgreen/RedGreen/horrible-harry

This is nesessary because git is crap.  How can I merge in these
necessary changes -- when I don't know what they are?

Throw me a frickin bone here.
Steve Thielemann há 4 anos atrás
pai
commit
34fe3ad79b
1 ficheiros alterados com 1 adições e 1 exclusões
  1. 1 1
      mystic.cpp

+ 1 - 1
mystic.cpp

@@ -624,7 +624,7 @@ int mangle(int fd, const char *buffer, int len) {
           */
           const char *phrasing[] = {"^R1Haha^P1ha^P1ha", "Poof!", "Got U",
                                     "Anyone there?", "^R1Knock, ^P1Knock",
-                                    "^G0101^C07^S6Segmentation Fault ^P1^S9(core ^C12^C24dumped^C07)^P2"};
+                                    "^G0101^C07^S9Segmentation fault (core dumped)^P2"};
           static LastSeen last_phrasing(2);
 
           ZF_LOGI("mangle(ANSI_CLS)");