IPP Software

Navigation

Tools

IPP Links

Communication

Pan-STARRS Links

Context Navigation

← Previous Change
Next Change →

Changeset 37807 for trunk/Ohana/src/opihi/include/data.h

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

Files:

: 2 edited

. (modified) (1 prop)
src/opihi/include/data.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/Ohana

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20140904/Ohana (added)

merged: 37376-37380,37386-37387,37389-37390,37392,37394-37395,37402,37417,37421-37422,37425-37429,37434-37438,37443-37447,37449,37451-37458,37460,37462-37464,37467,37471,37477-37479,37481,37484-37485,37489-37491,37493-37500,37509,37511-37514,37520-37523,37525-37528,37531-37534,37536-37541,37545-37550,37562-37572,37574-37576,37578-37580,37584-37585,37593,37595-37598,37600-37604,37606,37612-37614,37621-37623,37630-37632,37641-37669,37674-37677,37680-37703,37705-37706,37718-37720,37730-37733,37742-37747,37757-37760,37780-37781,37790,37792-37796,37799,37803

trunk/Ohana/src/opihi/include/data.h

r36679	r37807
224	224	void ListMedImages ();
225	225
	226	// in tvchannel.c
	227	int GetKapaChannelFromString (char *string);
	228
226	229	# endif

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

Download in other formats: