Viewing all changes in revision 1537.
- Committer: Robert Ancell
- Date: 2013-07-21 09:14:57 UTC
- mfrom: (1533.1.181 trunk)
- Revision ID: robert.ancell@canonical.com-20130721091457-mhe6180e2tlx8lha
Merge with trunk
- files added:
- tests/scripts/dbus.conf
- files removed:
- src/ldm-marshal.list
- 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
expand all
collapse all
added
removed
