Context Navigation

← Previous Change
Next Change →

constants.h

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

: 3 edited

. (modified) (1 prop)
Ohana (modified) (1 prop)
Ohana/src/kapa2/include/constants.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/tap_branches

Property svn:mergeinfo changed

/branches/pap_delete (added)	merged: 27537-27541
/trunk (added)	merged: 25902,25904,25906-25910,25913-25916,25918-25923,25925-25937,25939-25947,25949,25951-25953,25957-25958,25961-25963,25965-25966,25971-25974,25976-26005,26008,26012-26051,26053-26054,26067-26068,26070-26118,26138-26162,26169-26194,26201-26218,26242,26256-26266,26271-26294,26296-26297,26327-26329,26331,26333-26338,26349-26371,26376-26400,26403-26412,26437-26461,26465-26466,26477-26478,26481-26485,26489,26492-26500,26510-26521,26526-26529,26538,26544-26546,26548-26550,26554-26561,26563-26571,26584,26600-26602,26615-26622,26624,26629,26636-26641,26644,26651-26656,26658,26662-26665,26670,26672,26676-26680,26682-26683,26692,26694,26698-26699,26709-26710,26736,26744-26745,26749,26766,26796-26798,26815,26826,26829,26831,26848,26851,26856,26884,26886-27086,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-27516,27518-27522,27524-27525,27527,27529-27534,27536,27542-27547,27549-27558,27560-27620,27631-27634,27638-27646,27652,27657-27692,27694-27705,27710-27712,27716-27725,27728-27731,27734-27767,27773-27783,27785-27786,27788-27790,27793-27813,27816-27822,27832-27834
/branches/czw_branch/cleanup	removed
/branches/eam_branches/20090522	removed
/branches/eam_branches/20090715	removed
/branches/eam_branches/20090820	removed
/branches/pap	removed
/branches/pap_mops	removed

branches/tap_branches/Ohana
- Property svn:mergeinfo set to (toggle deleted branches)
  /trunk/Ohana merged eligible
  /branches/eam_branches/Ohana.20100407 27635-27772
  /branches/pap_delete/Ohana 27530-27595

branches/tap_branches/Ohana/src/kapa2/include/constants.h

-              r25757
+              r27838
 # define NCHANNELS 3
 # define NPIXELS_DYNAMIC 4600
+# define NPIXELS_DYNAMIC 128
 // XXX for the moment, this is set to match the values in SetColorScale3D_CC
 # define NPIXELS_STATIC 4600
+# define NPIXELS_STATIC 128
 # define PAD1  3

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

/trunk/Ohana	merged	eligible
/branches/eam_branches/Ohana.20100407	27635-27772
/branches/pap_delete/Ohana	27530-27595

Context Navigation

Changeset 27838 for branches/tap_branches/Ohana/src/kapa2/include/constants.h

Legend:

branches/tap_branches

branches/tap_branches/Ohana

branches/tap_branches/Ohana/src/kapa2/include/constants.h

Download in other formats: