Viewing all changes in revision 6374.17.38.
- Committer: Stuart Bishop
- Date: 2010-09-03 16:43:11 UTC
- mfrom: (7675.785.97 launchpad)
- mto: (7675.785.98 launchpad)
- mto: This revision was merged to the branch mainline in revision 11516.
- Revision ID: stuart.bishop@canonical.com-20100903164311-khz10b5hauwfd9em
Merge from lp:launchpad and resolve conflicts
- files added:
- database/schema/patch-2208-05-0.sql
- files removed:
- lib/canonical/cachedproperty.py
- files renamed:
- lib/lp/registry/browser/tests/test_distroseries_views.py => lib/lp/registry/browser/tests/test_series_views.py
- files modified:
- .ctags
expand all
collapse all
added
removed
