diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-07-02 09:46:08 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-07-02 09:46:08 +0000 |
commit | 9d1e8bcf6ee35b25a3e02b47a30a0b3cda89461d (patch) | |
tree | 9d8eb7e1bf90e8dcc4c3212cfe28312846391809 /src/Bottleneck_distance/concept/Persistence_diagram.h | |
parent | 4006d0f51dea0bf4234fbdc62b35fe71562293d8 (diff) | |
parent | 34d50c272e468e3cf39d18c7e43730274d936acd (diff) |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/python_nerve_gic_vincent@3656 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1f02e2f3b3e716d6578be49437e7d0b33fa99e5b
Diffstat (limited to 'src/Bottleneck_distance/concept/Persistence_diagram.h')
-rw-r--r-- | src/Bottleneck_distance/concept/Persistence_diagram.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Bottleneck_distance/concept/Persistence_diagram.h b/src/Bottleneck_distance/concept/Persistence_diagram.h index b157f22a..d016faf4 100644 --- a/src/Bottleneck_distance/concept/Persistence_diagram.h +++ b/src/Bottleneck_distance/concept/Persistence_diagram.h @@ -4,7 +4,7 @@ * * Author: François Godi * - * Copyright (C) 2015 INRIA + * Copyright (C) 2015 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |