Skip to content
Snippets Groups Projects
Commit 4edfc1f6 authored by Nelson Tavares de Sousa's avatar Nelson Tavares de Sousa
Browse files

Merge remote-tracking branch 'origin/master' into pipe-instantiation 

Conflicts:
	src/changes/changes.xml
	src/main/java/teetime/framework/Analysis.java
parents 199e37a2 792a4d3b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 196 additions and 55 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