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

Merge branch 'aaccept' into alib2 

Conflicts:
	makefile
parents 42232357 b0a39c41
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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