diff options
| author | Jesús González <jgonzalez@gdr-sistemas.com> | 2015-02-13 11:55:42 +0100 |
|---|---|---|
| committer | Jesús González <jgonzalez@gdr-sistemas.com> | 2015-02-13 11:55:42 +0100 |
| commit | 204e587976786ba3c5b2ee5c3b32d897246abd38 (patch) | |
| tree | 0a0d29efcab519666a6b5e902565df30d4d6aef3 /tests | |
| parent | 27a369121fa4fc2146dbc5653139b06ff6301ab2 (diff) | |
| download | lightdm-204e587976786ba3c5b2ee5c3b32d897246abd38.tar.gz | |
Fixed improper merging of parent branch
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ec291966..b64e1ffc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -166,10 +166,12 @@ TESTS = \ test-vnc-command \ test-vnc-dimensions \ test-vnc-open-file-descriptors \ + test-vnc-guest \ test-xdmcp-client \ test-xdmcp-server-autologin \ test-xdmcp-server-login \ test-xdmcp-server-double-login \ + test-xdmcp-server-guest \ test-utmp-login \ test-utmp-autologin \ test-utmp-wrong-password \ @@ -561,6 +563,7 @@ EXTRA_DIST = \ scripts/utmp-wrong-password.conf \ scripts/vnc-command.conf \ scripts/vnc-dimensions.conf \ + scripts/vnc-guest.conf \ scripts/vnc-login.conf \ scripts/vnc-open-file-descriptors.conf \ scripts/xauthority.conf \ @@ -569,6 +572,7 @@ EXTRA_DIST = \ scripts/xdmcp-client.conf \ scripts/xdmcp-server-autologin.conf \ scripts/xdmcp-server-double-login.conf \ + scripts/xdmcp-server-guest.conf \ scripts/xdmcp-server-login.conf \ scripts/xdmcp-server-open-file-descriptors.conf \ scripts/xserver-fail-start.conf \ |