first commit
feature1 a medias
fixes #1: feature 1
jesusp first commit
Added signature file.
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop: Jesus GyG
test
jp
jp
first local change
last local change
more changes
fixed #2: feature2
fixes #2.1: first bugfix
jp commit
jp commit
Merge remote-tracking branch 'jgg/feature2' into jp
GPU stuff
Manually merged confflict.