Commit Graph

2 Commits

Author SHA1 Message Date
xant
3b4b091f6e merging more stuff from 6b738edfc17744259a1289af02d977bc65036d11
Conflicts:

        xcode/CVScreenView.mm
        xcode/English.lproj/MainMenu.nib/designable.nib
        xcode/English.lproj/MainMenu.nib/keyedobjects.nib
        xcode/Exporter.h
2010-03-27 23:54:02 +01:00
xant
f580718856 importing exporter implementation from flowmixer 2010-03-27 22:56:17 +01:00