gitignore
gitignore
Merge branch 'release/5.6'
gitignore
Merge remote-tracking branch 'upstream/master' into develop
Prevent warning when willing to launch a plugin programmatically.
Allow the annotations to be managed as a local preference for each DCMView
Merge branch 'dcmviewLocalAnnotations' into develop
Allow local annotations on DCMViews.
DCMView observes annotation preference for local management.
Remove ANNOTATIONS global variable from DCMView.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	DCMView.m
Merge pull request #1 from b-deville/develop

ANNOTATIONS as a class variable