Skip to content

Commit

Permalink
Merge branch 'master' into 1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@wojtekka
wojtekka committed Nov 2, 2013
2 parents 72b92e7 + 3f1b8ce commit a9ad887
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Makefile.in
*.lo
.deps
.libs
*.tar.gz
*.pb-c.*
stamp-h*
config.*
Expand Down
2 changes: 2 additions & 0 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ endif

DIST_SUBDIRS = include src pkgconfig examples docs test

EXTRA_DIST = packets.proto protobufgen.sh

LIBTOOL_DEPS = @LIBTOOL_DEPS@

libtool: $(LIBTOOL_DEPS)
Expand Down
2 changes: 1 addition & 1 deletion test/automatic/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ packet_LDADD = $(top_builddir)/src/libgadu.la

resolver_LDADD = $(top_builddir)/src/libgadu.la

EXTRA_DIST = protocol.txt connect.txt
EXTRA_DIST = protocol.txt connect.txt connect.pem

SUBDIRS = script

Expand Down

0 comments on commit a9ad887

Please sign in to comment.