Context Navigation

← Previous Change
Next Change →

Makefile.am

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

: 3 edited

. (modified) (1 prop)
ppSub (modified) (1 prop)
ppSub/src/Makefile.am (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk

Property svn:mergeinfo changed

/branches/pap (added)

merged: 23511,23520-23521,23532,23578-23581,23596-23599,23603-23604,23606-23608,23619-23621,23638-23639,23641,23646-23648,23651-23653,23656,23672-23674,23677-23684

trunk/ppSub
- Property svn:mergeinfo changed
  /branches/pap/ppSub (added) merged: 23580,23597,23599,23672-23674,23684

trunk/ppSub/src/Makefile.am

r23229	r23688
19	19	ppSubBackground.c \
20	20	ppSubCamera.c \
	21	ppSubData.c \
21	22	ppSubLoop.c \
22	23	ppSubReadout.c \

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

Context Navigation

Changeset 23688 for trunk/ppSub/src/Makefile.am

Legend:

trunk

trunk/ppSub

trunk/ppSub/src/Makefile.am

Download in other formats: