merge

diff --cc STEER/ESD/AliESDfriendTrack.h
Simple merge

diff --cc STEER/STEERBase/AliVfriendEvent.h
Simple merge

diff --cc STEER/STEERBase/AliVfriendTrack.h
index a8cab4f961f2d82c0359ddc245edf3f409a5eb92,2cb197aa045b54b237ae8e66381b23e70e728dbe..722e6ffa4600d0c5bf87a9424b5d4e658886ba4e
--- 1/STEER/STEERBase/AliVfriendTrack.h
--- 2/STEER/STEERBase/AliVfriendTrack.h
+++ b/STEER/STEERBase/AliVfriendTrack.h
@@@ -4,8 -4,8 +4,9 @@@
  //_____________________________________________________________________________
  #include "AliVMisc.h"
  
 +#include "TObject.h"
  #include "Rtypes.h"
+ #include "TObject.h"
  class AliTPCseed;
  class AliVVtrackPointArray;
  class AliExternalTrackParam;
@@@ -16,9 -16,9 +17,9 @@@ class AliVfriendTrack :public TObject 
  public:
  
    AliVfriendTrack(){}
-   AliVfriendTrack(const AliVfriendTrack &f) :TObject(f){}
 - AliVfriendTrack( const AliVfriendTrack &t): TObject(t) {}  
++  AliVfriendTrack( const AliVfriendTrack &t): TObject(t) {}
    // constructor for reinitialisation of vtable
-   AliVfriendTrack( AliVConstructorReinitialisationFlag ){}
+   AliVfriendTrack( AliVConstructorReinitialisationFlag ): TObject(){}
    virtual ~AliVfriendTrack(){}
  
    //used in calibration