Merge branch 'devel'

This commit is contained in:
Jay Sorg
2015-01-07 20:44:16 -08:00
120 changed files with 4478 additions and 14598 deletions
+5 -1
View File
@@ -22,10 +22,14 @@ startscript_DATA = \
km-0409.ini \
km-040c.ini \
km-0410.ini \
km-0411.ini \
km-0415.ini \
km-0419.ini \
km-041d.ini \
km-0816.ini
km-0816.ini \
km-e0010411.ini \
km-e0200411.ini \
km-e0210411.ini
# must be tab below
install-data-hook:
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+7 -2
View File
@@ -1,7 +1,12 @@
.nofail
.fail
load-module module-augment-properties
load-module module-xrdp-sink
load-module module-xrdp-source
load-module module-always-sink
.ifexists module-xrdp-sink.so
load-module module-xrdp-sink
.endif
.ifexists module-xrdp-source.so
load-module module-xrdp-source
.endif
load-module module-native-protocol-unix