Performance improvement in text rendering of FamiTracker pattern view.
Fixing xplatform merge conflicts.
Fixing xplatform merge conflicts.
Minor changes to NESICIDE for FamiTracker inclusion.  Not quite there yet.
Fixing minor compile warning.
Starting to implement folding.
FamiTracker and NESICIDE working together, mostly.  Hacked NESICIDE's SDL config for now to match FamiTracker's. Added SDL callback hook to FamiTracker's SDL callback so that NESICIDE's callback could be called from it.
Minor performance improvements.
Adding SW scopes.
Fixing scope window size.
Fixing scope window size.
Merge remote-tracking branch 'refs/remotes/upstream/master' into mac

Conflicts:
	apps/ide/nes/designers/musiceditorform.cpp
	common/cqtmfc.cpp