diff options
author | James Cameron <quozl@laptop.org> | 2010-12-10 22:47:23 (GMT) |
---|---|---|
committer | James Cameron <quozl@laptop.org> | 2010-12-10 22:47:23 (GMT) |
commit | 94574ebd1c05783f455712d5ab13f537e2ab9739 (patch) | |
tree | 63e36bf8ff5618dee01f31f9568e0ee322efd9f7 /extensions/cpsection/aboutcomputer/view.py | |
parent | f1eca6f36024cff7cc4a61cfb2a52eae219b0d17 (diff) | |
parent | 62cb0e9595fbfa6e1ef7d1edfb968fef0ea253b4 (diff) |
Merge branch 'sucrose-0.84' of git.sugarlabs.org:sugar/mainline into sucrose-0.84
Conflicts:
src/jarabe/journal/model.py
Diffstat (limited to 'extensions/cpsection/aboutcomputer/view.py')
-rw-r--r-- | extensions/cpsection/aboutcomputer/view.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py index dd4f8f3..4b638ff 100644 --- a/extensions/cpsection/aboutcomputer/view.py +++ b/extensions/cpsection/aboutcomputer/view.py @@ -174,7 +174,7 @@ class AboutComputer(SectionView): vbox_copyright.set_border_width(style.DEFAULT_SPACING * 2) vbox_copyright.set_spacing(style.DEFAULT_SPACING) - label_copyright = gtk.Label("© 2006-2009 One Laptop per Child " + label_copyright = gtk.Label("© 2006-2010 One Laptop per Child " "Association Inc; Red Hat Inc; Collabora Ltd; " "and Contributors.") label_copyright.set_alignment(0, 0) |