Merge authors: Václav Šmilauer (eudoxos) ------------------------------------------------------------ revno: 2395 [merge] committer: Václav Šmilauer <eudo...@arcig.cz> branch nick: trunk timestamp: Sun 2010-08-15 06:31:26 +0200 message: merge noqt3 branch removed: gui/qt3/ gui/qt3/FileDialog.cpp gui/qt3/FileDialog.hpp gui/qt3/GLViewer.cpp gui/qt3/GLViewer.cw gui/qt3/GLViewer.hpp gui/qt3/MessageDialog.cpp gui/qt3/MessageDialog.hpp gui/qt3/QtFileGenerator.cpp gui/qt3/QtFileGenerator.hpp gui/qt3/QtFileGeneratorController.ui gui/qt3/QtGUI-python.cpp gui/qt3/QtGUI.cpp gui/qt3/QtGUI.hpp gui/qt3/QtGUIPreferences.cpp gui/qt3/QtGUIPreferences.hpp gui/qt3/QtGeneratedMessageDialog.ui gui/qt3/QtGeneratedSimulationController.ui gui/qt3/SimulationController.cpp gui/qt3/SimulationController.hpp gui/qt3/SnapshotEngine.cpp gui/qt3/SnapshotEngine.hpp gui/qt3/YadeCamera.cpp gui/qt3/YadeCamera.hpp gui/qt3/YadeQtGeneratedMainWindow.ui gui/qt3/YadeQtMainWindow.cpp gui/qt3/YadeQtMainWindow.hpp gui/qt3/pictures/ gui/qt3/pictures/XYZ.png gui/qt3/pictures/YZX.png gui/qt3/pictures/ZXY.png gui/qt3/pictures/add.png gui/qt3/pictures/camera.png gui/qt3/pictures/folder.png gui/qt3/pictures/folder_big.png gui/qt3/pictures/pause.png gui/qt3/pictures/play.png gui/qt3/pictures/plugins.png gui/qt3/pictures/plugins_big.png gui/qt3/pictures/record.png gui/qt3/pictures/remove.png gui/qt3/pictures/reset.png gui/qt3/pictures/step.png gui/qt3/qt.py gui/qt4/SeqSerializable.ui lib/loki/ lib/loki/AssocVector.hpp lib/loki/EmptyType.hpp lib/loki/Functor.hpp lib/loki/NullType.hpp lib/loki/TypeManip.hpp lib/loki/TypeTraits.hpp lib/loki/Typelist.hpp lib/loki/_dummySourceFile.cpp lib/opengl/FpsTracker.cpp lib/opengl/FpsTracker.hpp lib/opengl/GLTextLabel.cpp lib/opengl/GLTextLabel.hpp lib/opengl/GLWindow.cpp lib/opengl/GLWindow.hpp lib/opengl/GLWindowsManager.cpp lib/opengl/GLWindowsManager.hpp lib/serialization-qt/ lib/serialization-qt/QtGUIGenerator.cpp lib/serialization-qt/QtGUIGenerator.hpp lib/serialization-xml/ lib/serialization-xml/XMLFormatManager.cpp lib/serialization-xml/XMLFormatManager.hpp lib/serialization-xml/XMLSaxParser.cpp lib/serialization-xml/XMLSaxParser.hpp lib/serialization/Archive.cpp lib/serialization/Archive.hpp lib/serialization/Archive.tpp lib/serialization/ArchiveTypes.hpp lib/serialization/ContainerHandler.tpp lib/serialization/FormatChecker.cpp lib/serialization/FormatChecker.hpp lib/serialization/FundamentalHandler.tpp lib/serialization/IOFormatManager.cpp lib/serialization/IOFormatManager.hpp lib/serialization/IOFormatManager.tpp lib/serialization/IOManagerExceptions.cpp lib/serialization/IOManagerExceptions.hpp lib/serialization/KnownFundamentalsHandler.tpp lib/serialization/MultiTypeHandler.tpp lib/serialization/PointerHandler.tpp lib/serialization/SerializableSingleton.cpp lib/serialization/SerializableSingleton.hpp lib/serialization/SerializableTypes.hpp lib/serialization/SerializationExceptions.cpp lib/serialization/SerializationExceptions.hpp renamed: lib/loki/Singleton.hpp => lib/base/Singleton.hpp modified: SConstruct core/FileGenerator.cpp core/FileGenerator.hpp core/Omega.cpp core/Omega.hpp debian/control-template doc/sphinx/installation.rst gui/SConscript gui/qt4/GLViewer.cpp gui/qt4/SerializableEditor.py lib/SConscript lib/factory/ClassFactory.hpp lib/multimethods/DynLibDispatcher.hpp lib/multimethods/FunctorWrapper.hpp lib/serialization/Serializable.cpp lib/serialization/Serializable.hpp lib/triangulation/Deformation.cpp* lib/triangulation/Deformation.h* lib/triangulation/Empilement.cpp* lib/triangulation/Empilement.h* lib/triangulation/KinematicLocalisationAnalyser.cpp* lib/triangulation/KinematicLocalisationAnalyser.hpp* lib/triangulation/Operations.cpp* lib/triangulation/Operations.h* lib/triangulation/RegularTriangulation.cpp* lib/triangulation/RegularTriangulation.h* lib/triangulation/Tenseur3.cpp* lib/triangulation/Tenseur3.h* lib/triangulation/Tesselation.cpp* lib/triangulation/Tesselation.h* lib/triangulation/Timer.cpp* lib/triangulation/Timer.h* lib/triangulation/TriaxialState.cpp* lib/triangulation/TriaxialState.h* lib/triangulation/basicVTKwritter.cpp* lib/triangulation/basicVTKwritter.hpp* lib/triangulation/def_types.h* lib/triangulation/stdafx.cpp* lib/triangulation/stdafx.h* py/yadeWrapper/yadeWrapper.cpp The size of the diff (14452 lines) is larger than your specified limit of 1000 lines
-- lp:yade https://code.launchpad.net/~yade-dev/yade/trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : yade-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
