Skip to content
Snippets Groups Projects
  • Jan Trávníček's avatar
    200c7f02
    Merge remote-tracking branch 'origin/trees' · 200c7f02
    Jan Trávníček authored
    Compilation errors fixed some more work needs to be done but ok for now.
    
    Conflicts:
    	alib2algo/src/automaton/convert/ToRegExp.cpp
    	alib2algo/src/automaton/convert/ToRegExp.h
    	alib2algo/src/automaton/properties/ReachableStates.cpp
    	alib2algo/src/automaton/transform/Reverse.cpp
    	alib2algo/src/automaton/transform/Reverse.h
    	alib2data/src/Api.cpp
    	alib2data/src/Api.hpp
    	alib2data/src/automaton/AutomatonBase.h
    	alib2data/src/automaton/AutomatonFromXMLParser.cpp
    	alib2data/src/automaton/AutomatonFromXMLParser.h
    	alib2data/src/automaton/AutomatonToXMLComposer.cpp
    	alib2data/src/automaton/AutomatonToXMLComposer.h
    	alib2data/src/automaton/FSM/FiniteAutomatonToStringComposer.cpp
    	alib2data/src/automaton/FSM/FiniteAutomatonToStringComposer.h
    	alib2data/src/object/ObjectBase.h
    	alib2data/src/object/ObjectFromXMLParser.cpp
    	alib2data/src/primitive/PrimitiveToXMLComposer.cpp
    	alib2data/test-src/automaton/AutomatonTest.cpp
    	arand2/src/arand.cpp
    	arun2/src/arun.cpp
    200c7f02
    History
    Merge remote-tracking branch 'origin/trees'
    Jan Trávníček authored
    Compilation errors fixed some more work needs to be done but ok for now.
    
    Conflicts:
    	alib2algo/src/automaton/convert/ToRegExp.cpp
    	alib2algo/src/automaton/convert/ToRegExp.h
    	alib2algo/src/automaton/properties/ReachableStates.cpp
    	alib2algo/src/automaton/transform/Reverse.cpp
    	alib2algo/src/automaton/transform/Reverse.h
    	alib2data/src/Api.cpp
    	alib2data/src/Api.hpp
    	alib2data/src/automaton/AutomatonBase.h
    	alib2data/src/automaton/AutomatonFromXMLParser.cpp
    	alib2data/src/automaton/AutomatonFromXMLParser.h
    	alib2data/src/automaton/AutomatonToXMLComposer.cpp
    	alib2data/src/automaton/AutomatonToXMLComposer.h
    	alib2data/src/automaton/FSM/FiniteAutomatonToStringComposer.cpp
    	alib2data/src/automaton/FSM/FiniteAutomatonToStringComposer.h
    	alib2data/src/object/ObjectBase.h
    	alib2data/src/object/ObjectFromXMLParser.cpp
    	alib2data/src/primitive/PrimitiveToXMLComposer.cpp
    	alib2data/test-src/automaton/AutomatonTest.cpp
    	arand2/src/arand.cpp
    	arun2/src/arun.cpp
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
tests.examples.sh 2.02 KiB