Merge branch '1.5'

This commit is contained in:
chrys
2017-08-23 21:37:42 +02:00
5 changed files with 4356 additions and 1 deletions
Submodule docu/DokuWiki-to-Markdown-Converter added at 31fa3ea64e
+2764
View File
File diff suppressed because it is too large Load Diff
+1590
View File
File diff suppressed because it is too large Load Diff
Regular → Executable
View File
+1 -1
View File
@@ -33,7 +33,7 @@ data_files.append((destDir, files))
files = glob.glob('tools/*')
data_files.append(('/usr/share/fenrir/tools', files))
data_files.append(('/usr/lib/systemd/system', ['autostart/systemd/fenrir.service']))
data_files.append(('/usr/share/man/man1', ['docu/fenrir.1']))
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()