Skip to content
Snippets Groups Projects
Commit 200c7f02 authored by Jan Trávníček's avatar Jan Trávníček
Browse files

Merge remote-tracking branch 'origin/trees' 

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
parents 1d069793 54fce11b
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 337 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment