Import Geant4 1.1.0 source tree

source/tracking/include/G4Trajectory.hh

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Trajectory.hh,v 1.6.4.1.2.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Trajectory.hh,v 1.9 2000/01/26 04:20:31 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -89,6 +89,7 @@ class G4Trajectory : public G4VTrajectory
    virtual int GetPointEntries() const { return positionRecord->entries(); }
    virtual G4VTrajectoryPoint* GetPoint(G4int i) const 
    { return (*positionRecord)[i]; }
+   virtual void MergeTrajectory(G4VTrajectory* secondTrajectory);
 
    G4ParticleDefinition* GetParticleDefinition();