aboutsummaryrefslogtreecommitdiffstats
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
commit65c9b02da2dfd7232c75652c674b57f02689b354 (patch)
tree7e33c61ae1c4198b7f281720945478bb41463ae8
parent8e448f69bb8934fc3953db5e3a2144f3584e0507 (diff)
parent5d087f072718776823113022960529b006bf6277 (diff)
Merge branch 'master' of ssh://github.com/krebscode/painload
-rw-r--r--etc/conf.d/reaktor (renamed from startup/conf.d/reaktor)0
-rwxr-xr-xetc/init.d/reaktor-debian (renamed from startup/init.d/reaktor-debian)0
-rw-r--r--etc/supervisor/Reaktor.conf (renamed from startup/supervisor/Reaktor.conf)0
3 files changed, 0 insertions, 0 deletions
diff --git a/startup/conf.d/reaktor b/etc/conf.d/reaktor
index a4f3f8e..a4f3f8e 100644
--- a/startup/conf.d/reaktor
+++ b/etc/conf.d/reaktor
diff --git a/startup/init.d/reaktor-debian b/etc/init.d/reaktor-debian
index a94384f..a94384f 100755
--- a/startup/init.d/reaktor-debian
+++ b/etc/init.d/reaktor-debian
diff --git a/startup/supervisor/Reaktor.conf b/etc/supervisor/Reaktor.conf
index 497066e..497066e 100644
--- a/startup/supervisor/Reaktor.conf
+++ b/etc/supervisor/Reaktor.conf