« back to all changes in this revision
Viewing changes to tests/scripts/xserver-no-share.conf
- Committer: Robert Ancell
- Date: 2013-07-23 02:24:45 UTC
- mfrom: (1723 trunk)
- mto: This revision was merged to the branch mainline in revision 1741.
- Revision ID: robert.ancell@canonical.com-20130723022445-gpaq8vtkp4hods7r
Merge with trunk
- files added:
- src/xgreeter.c
- files removed:
- src/display.c
- files renamed:
- tests/data/xgreeters/ => tests/data/greeters/
- tests/data/xsessions/ => tests/data/sessions/
- tests/scripts/xdmcp-login.conf => tests/scripts/xdmcp-server-login.conf
- tests/scripts/xdmcp-open-file-descriptors.conf => tests/scripts/xdmcp-server-open-file-descriptors.conf
- tests/test-xdmcp-login => tests/test-xdmcp-server-login
- tests/test-xdmcp-open-file-descriptors => tests/test-xdmcp-server-open-file-descriptors
- files modified:
- .bzrignore
added
removed
tests/scripts/xserver-no-share.conf
