Changeset 610 for trunk/geant4/visualization/OpenGL/History

Timestamp:

Nov 22, 2007, 6:07:00 PM (18 years ago)

Author:

garnier

Message:

r661@mac-90108: laurentgarnier | 2007-11-22 18:10:43 +0100
en debug

File:

• trunk/geant4/visualization/OpenGL/History (modified) (4 diffs)

trunk/geant4/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.100 2007/11/16 10:41:54 lgarnier Exp $
+$Id: History,v 1.101 2007/11/16 11:15:43 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -21 +21 @@
 -------------------------------------
 
-<<<<<<< History
+15th November 2007  John Allison  (opengl-V09-00-03)
+- Re-introduced Qt files, now properly protected by cpp flags.
+- cpp flags also added to some other files not previously properly protected.
+
 15 Nov 2007, Laurent Garnier
  - G4UIQt,G4Qt : Adding a GEANT4_QT_DEBUG flag to hide all debug messages
@@ -33 +36 @@
      Adding protection for Qt version between 4.0 and 4.2
 
+13th November 2007  John Allison  (opengl-V09-00-02)
+- Removed Qt files from tag.  File are still at head - need fixing.
+
 13 Nov 2007, Laurent Garnier
  - G4UIQt,G4Qt : Moving all moc in one big file interface/G4UIQT_moc.cc,
    including Qt3 and Qt4 moc support
+
+10th November 2007  John Allison  (opengl-V09-00-01)
+- Moved WinSize_x, y to base class G4OpenGLViewer.
+- Minor improvement in guidance for /vis/ogl/printEPS.
 
 09 Nov 2007, Laurent Garnier
@@ -55 +65 @@
    - moc_G4OpenGLQtViewer.cc
 
-=======
-15th November 2007  John Allison  (opengl-V09-00-03)
-- Re-introduced Qt files, now properly protected by cpp flags.
-- cpp flags also added to some other files not previously properly protected.
-
-13th November 2007  John Allison  (opengl-V09-00-02)
-- Removed Qt files from tag.  File are still at head - need fixing.
-
-10th November 2007  John Allison  (opengl-V09-00-01)
-- Moved WinSize_x, y to base class G4OpenGLViewer.
-- Minor improvement in guidance for /vis/ogl/printEPS.
-
 28th September 2007  lgarnier
 - first import of G4UI Qt files : Do not try to compil them
 
->>>>>>> 1.99
 21st August 2007  John Allison  (opengl-V09-00-00)
 - Removed redundant G4OpenGLXViewerMessenger.