Changeset 37639
- Timestamp:
- Nov 19, 2014, 2:58:44 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20141119/psphot/src/psphotGalaxyParams.c
-
Property svn:mergeinfo
set to (toggle deleted branches)
/trunk/psphot/src/psphotGalaxyParams.c merged eligible /branches/eam_branches/ipp-20140423/psphot/src/psphotGalaxyParams.c 36693-36832 /branches/eam_branches/ipp-20140610/psphot/src/psphotGalaxyParams.c 36845-37030 /branches/eam_branches/ipp-20140717/psphot/src/psphotGalaxyParams.c 37083-37244 /branches/eam_branches/ipp-20140813/psphot/src/psphotGalaxyParams.c 37260-37353 /branches/eam_branches/ipp-ops-20130712/psphot/src/psphotGalaxyParams.c 37064-37069 /branches/eam_branches/ps2-tc3-20130727/psphot/src/psphotGalaxyParams.c 35859-37403 /tags/ipp-20130712/psphot/src/psphotGalaxyParams.c 35815-37063
r37633 r37639 164 164 } 165 165 psScalar *scalar = NULL; 166 scalar = job->args->data[ 5];166 scalar = job->args->data[8]; 167 167 Next += scalar->data.S32; 168 scalar = job->args->data[ 6];168 scalar = job->args->data[9]; 169 169 Npetro += scalar->data.S32; 170 scalar = job->args->data[ 7];170 scalar = job->args->data[10]; 171 171 Nannuli += scalar->data.S32; 172 172 psFree(job); -
Property svn:mergeinfo
set to (toggle deleted branches)
Note:
See TracChangeset
for help on using the changeset viewer.
