simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #294 from Grimthorr/changelog

Browse source 
Fix build error caused by #293
This commit is contained in:
Luka Krajger 2015-03-11 14:18:08 +01:00
commit 2f2d6ffabf
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -11,7 +11,7 @@ noinst_HEADERS = libhttp/http.h
dist_doc_DATA = AUTHORS \ dist_doc_DATA = AUTHORS \
COPYING \ COPYING \
GPL-2 \ GPL-2 \
ChangeLog \ CHANGELOG.md \
INSTALL \ INSTALL \
NEWS \ NEWS \
README \ README \

4
Makefile.in
View file

@ -42,7 +42,7 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \ DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
$(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ CHANGELOG.md INSTALL NEWS TODO config.guess config.sub depcomp \
install-sh ltmain.sh missing install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -261,7 +261,7 @@ noinst_HEADERS = libhttp/http.h
dist_doc_DATA = AUTHORS \ dist_doc_DATA = AUTHORS \
COPYING \ COPYING \
GPL-2 \ GPL-2 \
ChangeLog \ CHANGELOG.md \
INSTALL \ INSTALL \
NEWS \ NEWS \
README \ README \