Tal Leming 41cc594e40 Merge changes from trunk. ...

git-svn-id: http://svn.robofab.com/branches/ufo3k@557 b5fa9d6c-a76f-4ffd-b3cb-f825fc41095c

2012-02-14 12:32:32 +00:00

..

__init__.py

Merge Erik's dialog work.

2011-10-18 18:40:07 +00:00

dialogs_default.py

More or less blindly merge all lib/robofab changes from the trunk. I don't know what they were all about, but they need to be merged so that work can continue here. Only one file had conflicts: interface/all/dialogs_default.py I noted that the ufo3k branch was the one in conflict and to use the changes in the trunk.

2011-12-27 14:02:11 +00:00

dialogs_fontlab_legacy1.py

More or less blindly merge all lib/robofab changes from the trunk. I don't know what they were all about, but they need to be merged so that work can continue here. Only one file had conflicts: interface/all/dialogs_default.py I noted that the ufo3k branch was the one in conflict and to use the changes in the trunk.

2011-12-27 14:02:11 +00:00

dialogs_fontlab_legacy2.py

Merge changes from trunk.

2012-02-14 12:32:32 +00:00

dialogs_legacy.py

More or less blindly merge all lib/robofab changes from the trunk. I don't know what they were all about, but they need to be merged so that work can continue here. Only one file had conflicts: interface/all/dialogs_default.py I noted that the ufo3k branch was the one in conflict and to use the changes in the trunk.

2011-12-27 14:02:11 +00:00

dialogs_mac_vanilla.py

More or less blindly merge all lib/robofab changes from the trunk. I don't know what they were all about, but they need to be merged so that work can continue here. Only one file had conflicts: interface/all/dialogs_default.py I noted that the ufo3k branch was the one in conflict and to use the changes in the trunk.

2011-12-27 14:02:11 +00:00

dialogs.py

Merge changes from trunk.

2012-02-14 12:32:32 +00:00