Commit e401b8eb authored by Nabil Chouika's avatar Nabil Chouika
Browse files

Merge branch 'master' into release-v1

parents 9ae3e3f1 73152369
......@@ -64,17 +64,18 @@ Here you can find our publications and the list of talks given on behalf of the
<hr>
<!--
# Acknowledgments {#mainpage_acknow}
The work on %PARTONS has been supported by the following grants:
* French National Research Agency, Commissariat l’Energie Atomique et aux Energies Alternatives, grant no. 12-MONU-0008-01;
* U.S. Department of Energy, Office of Science, Office of Nuclear Physics, contract no. DE-AC02-06CH11357.
The work on %PARTONS has been supported by the following grant:
* French National Research Agency, Commissariat l’Energie Atomique et aux Energies Alternatives, grant no. 12-MONU-0008-01.
<hr>
-->
# License {#mainpage_licences}
The following licenses apply: [elementary-utils](https://drf-gitlab.cea.fr/partons/core/elementary-utils) sub-project is under [Apache](https://www.apache.org/licenses/) license, while [numa](https://drf-gitlab.cea.fr/partons/core/numa), [partons](https://drf-gitlab.cea.fr/partons/core/partons) and [partons-example](https://drf-gitlab.cea.fr/partons/core/partons-example) are distributed under the [GPL](https://www.gnu.org/licenses/gpl.html) license. Please, respect the licensing!
The following licenses apply: [elementary-utils](https://drf-gitlab.cea.fr/partons/core/elementary-utils) sub-project is under the [Apache](https://www.apache.org/licenses/) license, while [numa](https://drf-gitlab.cea.fr/partons/core/numa), [partons](https://drf-gitlab.cea.fr/partons/core/partons) and [partons-example](https://drf-gitlab.cea.fr/partons/core/partons-example) are distributed under the [GPL](https://www.gnu.org/licenses/gpl.html) license. Please, respect the licensing!
<hr>
......
......@@ -2,6 +2,13 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-111114052-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-111114052-1');
</script>
<link href="$relpath^icon_partons.ico" rel="shortcut icon" type="image/x-icon">
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
......
......@@ -152,7 +152,7 @@ void Partons::printVersion() const {
m_pLoggerManager->info("Partons", __func__,
ElemUtils::Formatter() << "PARTONS " << PARTONS_VERSION_MAJOR << "."
<< PARTONS_VERSION_MINOR
<< " (www.partons.cea.fr) distributed under GNU Public License");
<< " (http://partons.cea.fr) distributed under GNU Public License");
m_pLoggerManager->info("Partons", __func__,
ElemUtils::Formatter() << "Built using Elementary-Utils "
<< ELEMENTARY_UTILS_VERSION_MAJOR << "."
......
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