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

..

.tx

Pulled all locs from Transifex

2013-08-03 17:34:02 -04:00

cocoa

Merge branch 'regless' into develop

2013-12-07 10:19:31 -05:00

controllers

Updated cocoalib

2013-10-20 16:01:59 -04:00

en.lproj

Fixed regless cocoa and updated locs

2013-11-30 18:23:42 -05:00

locale

Fixed regless cocoa and updated locs

2013-11-30 18:23:42 -05:00

Sparkle.framework

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

ui

Removed fairware

2013-11-30 17:54:40 -05:00

views

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

.gitignore

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

Dialogs.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

Dialogs.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSAboutBox.h

Removed fairware

2013-11-30 17:54:40 -05:00

HSAboutBox.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSErrorReportWindow.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSErrorReportWindow.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSGeometry.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSGeometry.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSPyUtil.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSPyUtil.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSQuicklook.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSQuicklook.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSRecentFiles.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

HSRecentFiles.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

LICENSE

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

NSEventAdditions.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

NSEventAdditions.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

NSImageAdditions.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

NSImageAdditions.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

NSNotificationAdditions.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

NSNotificationAdditions.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

ProgressController.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

ProgressController.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

Utils.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

Utils.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

ValueTransformers.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

ValueTransformers.m

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00

Worker.h

Added cocoalib as a subtree.

2013-06-22 21:32:48 -04:00