Commit 9261516a authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira
Browse files

Merge branch '9-this-package-contains-both-license-and-copying-files' into 'master'


Closes #9

See merge request !6
parents ef50e4d9 2d0a6fec
Pipeline #6311 passed with stages
in 13 minutes and 32 seconds
This diff is collapsed.
Copyright (c) 2016 Idiap Research Institute,
Written by Tiago de Freitas Pereira <>
Written by Andre Anjos <>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Supports Markdown
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