diff options
author | Julien Valroff <julien@kirya.net> | 2009-11-23 20:34:13 +0100 |
---|---|---|
committer | Julien Valroff <julien@kirya.net> | 2009-11-23 20:34:13 +0100 |
commit | cdd13877178b293b82818d9ad39fb553abd22078 (patch) | |
tree | fa0bf654b6f03ad07707fa13c91b2030aaa331ae /rapid/common.py | |
parent | 01a0b39d445eb9ba04b5240d1c62d52a74a0c2bd (diff) | |
parent | 1c557f52d4963e0ecf4f8a53a9099b2118137d5f (diff) |
Merge commit 'upstream/0.1.0.b2'
Conflicts:
PKG-INFO
doc/rapid-photo-downloader.pod
po/cs.po
po/en_GB.po
po/es.po
po/fr.po
po/hu.po
po/rapid-photo-downloader.pot
po/sk.po
rapid/ChangeLog
rapid/config.py
rapid/glade3/rapid.glade
rapid/media.py
rapid/rapid.py
Diffstat (limited to 'rapid/common.py')
0 files changed, 0 insertions, 0 deletions