IPP Software

Navigation

Tools

IPP Links

Communication

Pan-STARRS Links

Context Navigation

← Previous Changeset
Next Changeset →

Changeset 42374

Timestamp:

Feb 4, 2023, 12:16:42 PM (3 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20220316

Files:

: 8 edited

. (modified) (1 prop)
PS-IPP-Config (modified) (1 prop)
backups (modified) (1 prop)
extlibs (modified) (1 prop)
ippTests (modified) (1 prop)
ppStack (modified) (1 prop)
psconfig (modified) (1 prop)
psconfig/README (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/eam_branches/ipp-20220316

Property svn:mergeinfo changed

/tags/ipp-ops-20220303-rc (added)	merged: 42107,42111,42120-42121,42123
/tags/ipp-ops-20220705 (added)	merged: 42234,42236-42237,42239-42240,42244-42252,42256,42263,42284
/trunk	merged: 42180-42181,42228-42233,42235,42238,42241-42243,42253-42255,42257,42259,42272-42279,42283,42285,42288-42289,42293-42296,42298,42302,42306,42308-42309,42311-42314,42316,42332-42334,42336,42338,42340-42341,42355-42358

branches/eam_branches/ipp-20220316/PS-IPP-Config
- Property svn:mergeinfo changed
  /trunk/PS-IPP-Config (added) merged: 42285
branches/eam_branches/ipp-20220316/backups
- Property svn:mergeinfo changed
  /trunk/backups merged: 42285
branches/eam_branches/ipp-20220316/extlibs
- Property svn:mergeinfo changed
  /trunk/extlibs (added) merged: 42285,42313
branches/eam_branches/ipp-20220316/ippTests
- Property svn:mergeinfo deleted
branches/eam_branches/ipp-20220316/ppStack
- Property svn:mergeinfo changed
  /trunk/ppStack (added) merged: 42285
branches/eam_branches/ipp-20220316/psconfig
- Property svn:mergeinfo changed
  /tags/ipp-ops-20220705/psconfig (added) merged: 42252
  /trunk/psconfig (added) merged: 42285,42333

branches/eam_branches/ipp-20220316/psconfig/README

r42138	r42374
19	19	psbuild -extbuild -clean -rebuild -dev -optimize -debug-build ipp-manjaro
20	20
	21	For a new build, make sure you have a valid file for ~/.ipprc and ~/.ptolemyrc.
	22	Follow the directions in ipp/ippconfig/README
	23

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

Download in other formats: