Nicolas Sebrecht 3446aa9368 Merge branch 'ss/folder/base_clean-threadutil-import' into next ...

Conflicts:
	offlineimap/folder/Base.py

2011-01-10 18:58:05 +01:00

..

folder

Merge branch 'ss/folder/base_clean-threadutil-import' into next

2011-01-10 18:58:05 +01:00

repository

repository/*: replace UIBase.getglobalui() with getglobalui()

2011-01-05 19:24:00 +01:00

ui

Merge branch 'ss/ui-remove-detector' into next

2011-01-07 19:38:12 +01:00

__init__.py

Define version constants etc in __init__.py

2010-12-22 19:45:01 +01:00

accounts.py

Replace UIBase.getglobalui() with getglobalui()

2011-01-05 19:24:00 +01:00

CustomConfig.py

Update FSF address

2006-08-12 05:15:55 +01:00

imaplibutil.py

Replace UIBase.getglobalui() with getglobalui()

2011-01-05 19:24:00 +01:00

imapserver.py

Replace UIBase.getglobalui() with getglobalui()

2011-01-05 19:24:00 +01:00

imaputil.py

Replace UIBase.getglobalui() with getglobalui()

2011-01-05 19:24:00 +01:00

init.py

Merge branch 'ss/ui-remove-detector' into next

2011-01-07 19:38:12 +01:00

localeval.py

Update FSF address

2006-08-12 05:15:55 +01:00

mbnames.py

Update FSF address

2006-08-12 05:15:55 +01:00

syncmaster.py

remove unneeded includes from syncmaster.py

2010-12-09 19:52:48 +01:00

threadutil.py

Replace UIBase.getglobalui() with getglobalui()

2011-01-05 19:24:00 +01:00