]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of github.com:krakjoe/phpdbg
authorFelipe Pena <felipensp@gmail.com>
Sun, 10 Nov 2013 15:12:09 +0000 (13:12 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 10 Nov 2013 15:12:09 +0000 (13:12 -0200)
1  2 
phpdbg.c
phpdbg_prompt.c

diff --cc phpdbg.c
Simple merge
diff --cc phpdbg_prompt.c
index 9ab38ae096a4eb080700e873684bce96c9b484d6,f61f8d408f9e4c2088781c7d918ad6c4c8f30e83..05cf32242a51d0c31335d861415614c3f039d03c
@@@ -112,10 -112,10 +112,10 @@@ static PHPDBG_COMMAND(run) { /* {{{ *
              printf("Caught excetion in VM\n");
              return FAILURE;
          } zend_end_try();
 -        
 +
          return SUCCESS;
      } else {
-         printf("Nothing to execute !");
+         printf("Nothing to execute !\n");
          return FAILURE;
      }
  } /* }}} */