[xdebug-dev] [xdebug/xdebug] aaffd6: Update the changed xdebug.ini.

  Branch: refs/heads/master
  Home: https://github.com/xdebug/xdebug
  Commit: aaffd6fead9b5969c5bd99e07c381477e61f8f1a
      https://github.com/xdebug/xdebug/commit/aaffd6fead9b5969c5bd99e07c381477e61f8f1a
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2012-10-21 (Sun, 21 Oct 2012)

  Changed paths:
    M xdebug.ini

  Log Message:
  -----------
  Update the changed xdebug.ini.

  Commit: f0180b531102333dea9b37fe7cc3a9b81cb78da9
      https://github.com/xdebug/xdebug/commit/f0180b531102333dea9b37fe7cc3a9b81cb78da9
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2012-10-21 (Sun, 21 Oct 2012)

  Changed paths:
    M xdebug.ini

  Log Message:
  -----------
  Merged pull request #36

  Commit: 9405c43592973ab90bf2baf921f180438e53a927
      https://github.com/xdebug/xdebug/commit/9405c43592973ab90bf2baf921f180438e53a927
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2012-10-21 (Sun, 21 Oct 2012)

  Changed paths:
    A tests/bug00885.phpt
    M xdebug_stack.c

  Log Message:
  -----------
  Fixed bug #885: missing validation point returned by strchr in xdebug_error_cb.

  Commit: e3f75575257466402a2460fb5c48580b121f7977
      https://github.com/xdebug/xdebug/commit/e3f75575257466402a2460fb5c48580b121f7977
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2012-10-21 (Sun, 21 Oct 2012)

  Changed paths:
    A tests/bug00885.phpt
    M xdebug_stack.c

  Log Message:
  -----------
  Merged pull request #35

  Commit: ca3aa94842a098337c2a06075191ec32940d5d0a
      https://github.com/xdebug/xdebug/commit/ca3aa94842a098337c2a06075191ec32940d5d0a
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2012-10-21 (Sun, 21 Oct 2012)

  Changed paths:
    A tests/bug00879.inc
    A tests/bug00879.phpt
    M xdebug.c

  Log Message:
  -----------
  Fixed bug #879: Closing brace in trait-using class definitions is counted towards code coverage.

  Commit: 9da6d935d93b2969f1e7d6bc4a6a4fe19b388ec8
      https://github.com/xdebug/xdebug/commit/9da6d935d93b2969f1e7d6bc4a6a4fe19b388ec8
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2012-10-21 (Sun, 21 Oct 2012)

  Changed paths:
    A tests/bug00879.inc
    A tests/bug00879.phpt
    M xdebug.c

  Log Message:
  -----------
  Merged pull request #34

  Commit: 72fd4b1c2877f2501ec783439d5239502fb7ff6a
      https://github.com/xdebug/xdebug/commit/72fd4b1c2877f2501ec783439d5239502fb7ff6a
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2012-10-21 (Sun, 21 Oct 2012)

  Changed paths:
    A tests/bug00879.inc
    A tests/bug00879.phpt
    A tests/bug00885.phpt
    M xdebug.c
    M xdebug.ini
    M xdebug_stack.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_2'

Conflicts:
        xdebug.ini

Compare: https://github.com/xdebug/xdebug/compare/a191144584a1...72fd4b1c2877
Received on Sun Oct 21 2012 - 20:25:39 BST