Viewing all changes in revision 3071.
- Committer: Michael Vogt
- Date: 2012-07-19 09:29:16 UTC
- mfrom: (2989.33.20 5.2)
- Revision ID: michael.vogt@ubuntu.com-20120719092916-dei4mt5hhyxkqm23
merged from the 5.2 branch, resolve conflicts (many :/) and fix failing tests in test_unity_launcher_integration via setUpClass and updates to the DesktopFilepathConversionTestCase bits to use os.path.join()
- files modified:
- debian/changelog
expand all
collapse all
added
removed
