Merge with guus/1.1

This commit is contained in:
thorkill 2015-11-06 22:56:46 +01:00
commit e95c1a93a7
12 changed files with 389 additions and 311 deletions

View file

@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = gnu
SUBDIRS = test src doc gui
SUBDIRS = src doc gui test systemd
ACLOCAL_AMFLAGS = -I m4