Context Navigation

difftool_definewarpwarp_select.sql

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

Property svn:mergeinfo changed

/branches/pap_stack (added)	merged: 27401,27405-27406,27409-27416
/trunk (added)	merged: 27088-27260,27262,27273-27280,27282-27290,27293-27294,27297-27304,27307-27311,27313-27335,27341-27349,27354-27356,27358-27367,27369-27371,27387-27389,27391-27396,27399-27400,27402-27404,27407-27408,27417-27420,27426-27427,27431-27436,27438-27439,27441-27486,27491,27503-27506,27510-27512

r24174	r27517
23	23	ON templateRawExp.exp_id = templateChipRun.exp_id
24	24	AND templateRawExp.filter = inputRawExp.filter
	25	WHERE inputWarpRun.state = 'full'
	26	AND templateWarpRun.state = 'full'
25	27	-- WHERE hook %s
26	28	GROUP BY input_warp_id

Note: See TracChangeset for help on using the changeset viewer.