dupeguru/cocoalib/cocoa
Virgil Dupras 418acf6e5e Merge branch 'regless' into develop
Conflicts:
	cocoa/inter/app.py
	core/app.py
	hscommon/reg.py
	locale/cs/LC_MESSAGES/ui.po
	locale/de/LC_MESSAGES/ui.po
	locale/fr/LC_MESSAGES/ui.po
	locale/hy/LC_MESSAGES/ui.po
	locale/it/LC_MESSAGES/ui.po
	locale/pt_BR/LC_MESSAGES/ui.po
	locale/ru/LC_MESSAGES/ui.po
	locale/ui.pot
	locale/uk/LC_MESSAGES/ui.po
	locale/vi/LC_MESSAGES/ui.po
	locale/zh_CN/LC_MESSAGES/ui.po
	qt/base/app.py
2013-12-07 10:19:31 -05:00
..
CocoaProxy.h On OS X, read Exif tags using Cocoa's built-in functionality 2013-11-10 12:00:16 -05:00
CocoaProxy.m Fixed compilation warnings on OS X 2013-11-10 12:41:10 -05:00
__init__.py Modernized progress window GUI 2013-08-03 16:27:36 -04:00
inter.py Merge branch 'regless' into develop 2013-12-07 10:19:31 -05:00