← Back to branch summary

~chuchiperriman/cloudsn/master

~chuchiperriman/cloudsn/master

Viewing all changes in revision 314.

Committer: Jesús Barbero Rodríguez
Date: 2012-05-20 22:05:54 UTC
mfrom: (309.1.12)
Revision ID: git-v1:90c2973c349961a901fc265722e22eb36b331da9

Merge branch 'gtk3'

Conflicts:
        debian/changelog
        debian/control
        src/cloudsn/const.py

files added:
data/greader-account.ui

debian/cloudsnpackaging.txt

doc

doc/cloudsnpackaging.txt

tests/greader.py

tests/poptest.py

files modified:
.gitignore

cloudsn-local

data/gmail-account.ui

data/imap-account.ui

data/preferences.ui

data/twitter-account.ui

debian/changelog

debian/control

setup.py

src/cloudsn/cloudsn.py

src/cloudsn/const.py

src/cloudsn/core/account.py

src/cloudsn/core/config.py

src/cloudsn/core/controller.py

src/cloudsn/core/indicator.py

src/cloudsn/core/keyring.py

src/cloudsn/core/keyrings/base64keyring.py

src/cloudsn/core/keyrings/gkeyring.py

src/cloudsn/core/keyrings/plainkeyring.py

src/cloudsn/core/notification.py

src/cloudsn/core/sound.py

src/cloudsn/core/utils.py

src/cloudsn/providers/feedsprovider.py

src/cloudsn/providers/gmailprovider.py

src/cloudsn/providers/greaderprovider.py

src/cloudsn/providers/identicaprovider.py

src/cloudsn/providers/imapprovider.py

src/cloudsn/providers/pop3provider.py

src/cloudsn/providers/providersbase.py

src/cloudsn/providers/twitterprovider.py

src/cloudsn/ui/about.py

src/cloudsn/ui/authwarning.py

src/cloudsn/ui/indicators/indicatorapplet.py

src/cloudsn/ui/indicators/statusicon.py

src/cloudsn/ui/utils.py

src/cloudsn/ui/window.py

Show diffs side-by-side

added added

removed removed

data/gmail-account.ui

data/greader-account.ui

data/imap-account.ui

data/preferences.ui

data/twitter-account.ui

debian/changelog

debian/cloudsnpackaging.txt

doc/cloudsnpackaging.txt

src/cloudsn/cloudsn.py

src/cloudsn/const.py

src/cloudsn/core/account.py

src/cloudsn/core/config.py

src/cloudsn/core/controller.py

src/cloudsn/core/indicator.py

src/cloudsn/core/keyring.py

src/cloudsn/core/keyrings/base64keyring.py

src/cloudsn/core/keyrings/gkeyring.py

src/cloudsn/core/keyrings/plainkeyring.py

src/cloudsn/core/notification.py

src/cloudsn/core/sound.py

src/cloudsn/core/utils.py

src/cloudsn/providers/feedsprovider.py

src/cloudsn/providers/gmailprovider.py

src/cloudsn/providers/greaderprovider.py

src/cloudsn/providers/identicaprovider.py

src/cloudsn/providers/imapprovider.py

src/cloudsn/providers/pop3provider.py

src/cloudsn/providers/providersbase.py

src/cloudsn/providers/twitterprovider.py

src/cloudsn/ui/about.py

src/cloudsn/ui/authwarning.py

src/cloudsn/ui/indicators/indicatorapplet.py

src/cloudsn/ui/indicators/statusicon.py

src/cloudsn/ui/utils.py

src/cloudsn/ui/window.py

tests/greader.py

tests/poptest.py

Older »