summaryrefslogtreecommitdiff
path: root/utilities/Persistence_representations/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp
diff options
context:
space:
mode:
authorGard Spreemann <gspreemann@gmail.com>2018-06-15 12:34:03 +0200
committerGard Spreemann <gspreemann@gmail.com>2018-06-15 12:34:03 +0200
commit41482b4260b4aff3d6803e340d5c94fbefb9af67 (patch)
tree89eae43dcb3fd4ab040e96f3d5479427d8cd2c7f /utilities/Persistence_representations/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp
parent41a1b8c2728e212c832c0384c8bb424139a247cf (diff)
parentc524232f734de875d69e2f190f01a6c976024368 (diff)
Merge branch 'upstream/latest' into dfsg/latest
Diffstat (limited to 'utilities/Persistence_representations/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp')
-rw-r--r--utilities/Persistence_representations/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/utilities/Persistence_representations/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp b/utilities/Persistence_representations/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp
index fd0fcd15..6cf2739d 100644
--- a/utilities/Persistence_representations/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp
+++ b/utilities/Persistence_representations/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp
@@ -4,7 +4,7 @@
*
* Author(s): Pawel Dlotko
*
- * Copyright (C) 2016 INRIA (France)
+ * Copyright (C) 2016 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