diff options
author | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-05-17 12:10:57 +0200 |
---|---|---|
committer | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-05-17 12:10:57 +0200 |
commit | 69f1a4dfc0d3a7a1462d87a31b11197a638c5746 (patch) | |
tree | eb4be65262797896b928ab01bd5d1b12644cbe1b /src/Makefile.am | |
parent | 2b542db3b553e73bdd58f54f657776715fd5472d (diff) | |
parent | c2def65a701a973cde305d8c221d01beeb33eb84 (diff) |
Merge branch 'master' of https://git.oftal.dk/munia
Conflicts:
src/taskmanager.cc
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 01ef438..0e59695 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ muniacli_LDADD = $(LIBWEBSOCKETS_LIBS) muniacli_CXXFLAGS = $(LIBWEBSOCKETS_CFLAGS) -muniad_SOURCES = \ +muniacli_SOURCES = \ muniacli.cc EXTRA_DIST = \ |