Viewing all changes in revision 2494.2.17.
- Committer: Kevin DuBois
- Date: 2015-05-19 21:34:34 UTC
- mfrom: (2583 development-branch)
- mto: This revision was merged to the branch mainline in revision 2595.
- Revision ID: kevin.dubois@canonical.com-20150519213434-zlzfqka24kzyhqbl
merge mir fix conflicts
- files removed:
- tests/acceptance-tests/throwback/test_client_input.cpp
- files modified:
- debian/changelog
expand all
collapse all
added
removed
