Skip to content

Commit

Permalink
Merge remote-tracking branch 'datibbaw/kill-ereg'
Browse files Browse the repository at this point in the history
Conflicts:
	ext/ereg/config.w32
	ext/ereg/config0.m4
	ext/ereg/ereg.c
	ext/ereg/php_ereg.h
	ext/ereg/php_regex.h
	ext/ereg/regex/engine.c
	ext/ereg/regex/main.c
	ext/ereg/regex/regcomp.c
	ext/ereg/regex/regerror.c
	ext/ereg/tests/split_error_002.phpt
	ext/ereg/tests/split_variation_003.phpt
	ext/ereg/tests/spliti_error_002.phpt
	ext/ereg/tests/spliti_variation_003.phpt
	ext/pgsql/pgsql.c
	sapi/apache/php_apache_http.h
	sapi/apache_hooks/php_apache_http.h
  • Loading branch information
LawnGnome committed Mar 5, 2015
2 parents fd1578c + fcb1ab1 commit fea9a6f
Show file tree
Hide file tree
Showing 118 changed files with 45 additions and 14,938 deletions.
2 changes: 0 additions & 2 deletions ext/ereg/CREDITS

This file was deleted.

12 changes: 0 additions & 12 deletions ext/ereg/config.w32

This file was deleted.

57 changes: 0 additions & 57 deletions ext/ereg/config0.m4

This file was deleted.

0 comments on commit fea9a6f

Please sign in to comment.