aboutsummaryrefslogtreecommitdiff
path: root/src/ch/epfl
diff options
context:
space:
mode:
authorTimothée Floure2016-03-03 22:02:39 +0100
committerTimothée Floure2016-03-03 22:02:39 +0100
commit249778111cc6ac1f8d16b1c7141a037008dc728f (patch)
tree7b9131461b0ab8f34452964c15979a3554e8e204 /src/ch/epfl
parent264fec2ec938a6c525ca6f569692118a8216ca19 (diff)
parent3ab896dcbc80d1de49a625571ed0a63946fa0008 (diff)
downloadxblast-249778111cc6ac1f8d16b1c7141a037008dc728f.tar.gz
Merge branch 'conventions' into 'master'
Coding conventions If agreed, merge into master. See merge request !2
Diffstat (limited to 'src/ch/epfl')
0 files changed, 0 insertions, 0 deletions