Merge remote-tracking branch 'Dav1d23/master'

Conflicts:
	Makefile.am
	install-all.sh
This commit is contained in:
James Booth
2016-04-11 00:23:36 +01:00
10 changed files with 285 additions and 9 deletions

1
.gitignore vendored
View File

@@ -33,7 +33,6 @@ m4/
src/config.h
src/config.h.in
src/config.h.in~
src/prof_config.h
src/gitversion.h
src/gitversion.h.in
src/stamp-h1