diff options
author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-02-07 10:34:36 +0000 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-02-07 10:34:36 +0000 |
commit | 46975a115ee68ed742bb01d203dd6ec3d84dfa6b (patch) | |
tree | 6a87235d1a4a848ed7f9ef90f399a0a8d8f0d99b /.gitignore | |
parent | 06f455b9b47d9a902b67f06ba85af071e68e06ce (diff) | |
parent | 0700292bbee309aab483692e98857018840f86ac (diff) | |
download | rumba-46975a115ee68ed742bb01d203dd6ec3d84dfa6b.tar.gz rumba-46975a115ee68ed742bb01d203dd6ec3d84dfa6b.zip |
Merge branch 'master-vincenzo' into 'master'
Master vincenzo
See merge request !5
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions