[Bf-blender-cvs] [dfbbd4b] soc-2016-multiview: solve conflict

[Tianwei Shen]

Commit: dfbbd4b2c2d18eff180429cccebe8d91892152a4
Author: Tianwei Shen
Date:   Mon May 30 18:54:42 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rBdfbbd4b2c2d18eff180429cccebe8d91892152a4

solve conflict

===================================================================



===================================================================

diff --cc source/blender/editors/space_clip/tracking_ops_correspondence.c
index f8f9d14,beb58e2..ca51b76
--- a/source/blender/editors/space_clip/tracking_ops_correspondence.c
+++ b/source/blender/editors/space_clip/tracking_ops_correspondence.c
@@@ -107,8 -107,7 +107,8 @@@ static int add_correspondence_exec(bCon
  		return OPERATOR_CANCELLED;
  	}
  
 -	// link two tracks
 +	// link two tracks, mark these two tracks in a different color
- 	ed_tracking_delect_all_tracks(tracksbase);
++	//ed_tracking_delect_all_tracks(tracksbase);
  
  	return OPERATOR_FINISHED;
  }