Bug #905

Merge master branch into 0.6 branch

Added by Trond Lossius about 8 years ago. Updated almost 8 years ago.

Status:ClosedStart date:2011-08-10
Priority:NormalDue date:
Assignee:Théo de la Hogue% Done:

0%

Category:-Spent time:-
Target version:MVC for 0.6
Branch: OS:

Description

Current list of conflicts when merging master into 0.6-alpha branch (us=0.6-alpha, them=master) as of 2011-08-09:

#    added by us:        Max/documentation/examples/Modular0.6_overview/track/track.model.maxpat
#    both modified:      Max/library/components/initialized/jcom.initialized.maxpat
#    both modified:      Max/library/components/maxhelpui/jcom.maxhelpui.maxpat
#    both modified:      Max/library/components/preset_interface/jcom.preset_interface.maxpat
#    both modified:      Max/modules/audio/output~/jmod.output~.maxpat
#    both modified:      Max/modules/control/cueManager/jmod.cueManager.maxpat
#    both modified:      Max/modules/control/cueScript/jalg.cueScript.maxpat
#    both modified:      Max/modules/control/cueScript/jmod.cueScript.maxpat
#    both modified:      Max/modules/control/polhemus/jalg.polhemus.maxpat
#    both modified:      Max/modules/spatialization/sur.ambipanning~/jmod.sur.ambipanning~.maxpat
#    both modified:      Max/modules/spatialization/sur.ambisonics~/jmod.sur.ambisonics~.maxpat
#    both modified:      Max/modules/spatialization/sur.aux~/jmod.sur.aux~.maxhelp
#    both added:         Max/modules/spatialization/sur.info~/jalg.sur.info~.maxpat
#    both added:         Max/modules/spatialization/sur.info~/jmod.sur.info~.maxhelp
#    both added:         Max/modules/spatialization/sur.info~/jmod.sur.info~.maxpat
#    both modified:      Max/modules/spatialization/sur.meters~/jmod.sur.meters~.maxpat
#    added by us:        implementations/Example/TestModular/TestModular.xcodeproj/.svn/text-base/laurent.mode1v3.svn-base
#    deleted by us:      implementations/MaxMSP/jcom.hub/jcom.hub.autodoc.cpp
#    both modified:      implementations/MaxMSP/jcom.hub/jcom.hub.cpp
#    deleted by us:      implementations/MaxMSP/jcom.hub/jcom.hub.h
#    deleted by us:      implementations/MaxMSP/jcom.hub/jcom.hub.presets.cpp
#    deleted by them:    implementations/MaxMSP/jcom.messageArray/jcom.messageArray.maxhelp
#    deleted by them:    implementations/MaxMSP/jcom.messageArray/jcom.messageArray.xcodeproj/project.pbxproj
#    added by us:        implementations/MaxMSP/jcom.modular/jcom.modular.vcproj
#    deleted by them:    implementations/MaxMSP/jcom.namespace/jcom.namespace.cpp
#    deleted by them:    implementations/MaxMSP/jcom.namespace/jcom.namespace.maxhelp
#    deleted by them:    implementations/MaxMSP/jcom.namespace/jcom.namespace.xcodeproj/project.pbxproj
#    both deleted:       implementations/MaxMSP/jcom.node/jcom.node.vcproj
#    deleted by us:      implementations/MaxMSP/jcom.out/jcom.out.h
#    both modified:      implementations/MaxMSP/jcom.parameter/jcom.parameter.cpp
#    deleted by us:      implementations/MaxMSP/jcom.parameter/jcom.parameter.h
#    both modified:      implementations/MaxMSP/jcom.parameter/jcom.parameter.vcproj
#    deleted by them:    implementations/MaxMSP/jcom.parameterArray/jcom.parameterArray.cpp
#    deleted by them:    implementations/MaxMSP/jcom.parameterArray/jcom.parameterArray.maxhelp
#    deleted by them:    implementations/MaxMSP/jcom.parameterArray/jcom.parameterArray.vcproj
#    deleted by them:    implementations/MaxMSP/jcom.parameterArray/jcom.parameterArray.xcodeproj/project.pbxproj
#    deleted by us:      implementations/MaxMSP/jcom.return/jcom.return.cpp
#    deleted by them:    implementations/MaxMSP/jcom.returnArray/jcom.returnArray.maxhelp
#    added by us:        implementations/MaxMSP/jcom.returnArray/jcom.returnArray.vcproj
#    deleted by them:    implementations/MaxMSP/jcom.returnArray/jcom.returnArray.xcodeproj/project.pbxproj
#    deleted by them:    implementations/MaxMSP/jcom.snapshot/jcom.snapshot.cpp
#    both modified:      implementations/MaxMSP/jcom.ui/jcom.ui.h
#    both modified:      implementations/MaxMSP/jcom.ui/jcom.ui.internals.cpp
#    both modified:      library/Internals/jcom.receive.cpp
#    both modified:      library/Internals/jcom.send.cpp
#    deleted by us:      library/Jamoma.sln
#    both modified:      library/JamomaModular.vcproj
#    both modified:      library/JamomaModular.xcodeproj/project.pbxproj
#    both modified:      library/includes/Jamoma.h
#    both modified:      library/jamoma.def
#    both modified:      library/source/Jamoma.cpp

History

#1 Updated by Trond Lossius almost 8 years ago

  • Target version changed from 0.6 to MVC for 0.6

#2 Updated by Théo de la Hogue almost 8 years ago

  • Status changed from New to Resolved

it's resolved now but I add a task to do it regulary

#3 Updated by Trond Lossius almost 8 years ago

  • Status changed from Resolved to Closed

Hi Theo,

when a task is completed, I would recommend marking it as "closed" rather than "resolved". A resolved issue is still considered open. Typically you would mark something as being resolved if you believe that it is working now, but would like the person that first reported the issue to verify. You would then set it to resolved, and assign to that person. When he/she has tested it and found it to be working, he/she would change the status to closed.

I'm closing this one now, but I see that there are quite a few more issues with a "resolved" status and being assigned to you. It seems to me that if you take a look at them, you'll be able to close almost 20 issues.

Best,
Trond

Also available in: Atom PDF