summaryrefslogtreecommitdiffstats
path: root/Reaktor
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2014-03-19 11:35:05 +0100
committermakefu <github@syntax-fehler.de>2014-03-19 11:35:05 +0100
commitc63e5788024c199fcd0e3a17a9e4de074f12f437 (patch)
treecd93254ce2a6d0b3e4657af65524122b00f49baf /Reaktor
parentc7f8dc8adfd52f7ba562438c8609d15840d905a1 (diff)
parentf0a5a24f2f924a6426e5ed3e3b086edbca32500e (diff)
Merge branch 'master' of ssh://github.com/krebscode/painload
Diffstat (limited to 'Reaktor')
-rw-r--r--Reaktor/etc/conf.d/reaktor (renamed from Reaktor/startup/conf.d/reaktor)0
-rwxr-xr-xReaktor/etc/init.d/reaktor-debian (renamed from Reaktor/startup/init.d/reaktor-debian)0
-rw-r--r--Reaktor/etc/supervisor/Reaktor.conf (renamed from Reaktor/startup/supervisor/Reaktor.conf)0
3 files changed, 0 insertions, 0 deletions
diff --git a/Reaktor/startup/conf.d/reaktor b/Reaktor/etc/conf.d/reaktor
index a4f3f8e1..a4f3f8e1 100644
--- a/Reaktor/startup/conf.d/reaktor
+++ b/Reaktor/etc/conf.d/reaktor
diff --git a/Reaktor/startup/init.d/reaktor-debian b/Reaktor/etc/init.d/reaktor-debian
index a94384f4..a94384f4 100755
--- a/Reaktor/startup/init.d/reaktor-debian
+++ b/Reaktor/etc/init.d/reaktor-debian
diff --git a/Reaktor/startup/supervisor/Reaktor.conf b/Reaktor/etc/supervisor/Reaktor.conf
index 497066e9..497066e9 100644
--- a/Reaktor/startup/supervisor/Reaktor.conf
+++ b/Reaktor/etc/supervisor/Reaktor.conf