~bzr/loggerhead/daily-ppa

« back to all changes in this revision

Viewing changes to loggerhead/apps/branch.py

  • Committer: Max Bowsher
  • Date: 2011-03-15 00:35:34 UTC
  • mfrom: (182.150.14 trunk)
  • Revision ID: maxb@f2s.com-20110315003534-n4shb8sx63e14r3p
Merge trunk, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd.
 
1
# Copyright (C) 2008-2011 Canonical Ltd.
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
 
30
30
from loggerhead.apps import static_app
31
31
from loggerhead.controllers.annotate_ui import AnnotateUI
 
32
from loggerhead.controllers.view_ui import ViewUI
32
33
from loggerhead.controllers.atom_ui import AtomUI
33
34
from loggerhead.controllers.changelog_ui import ChangeLogUI
34
35
from loggerhead.controllers.diff_ui import DiffUI
124
125
        'files': InventoryUI,
125
126
        'revision': RevisionUI,
126
127
        'search': SearchUI,
 
128
        'view': ViewUI,
127
129
        }
128
130
 
129
131
    def last_updated(self):