Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into us_edit_issue
Browse files Browse the repository at this point in the history
  • Loading branch information
samo38 committed Jul 17, 2024
2 parents 186ada8 + 4400d2b commit 9df106b
Show file tree
Hide file tree
Showing 841 changed files with 388,091 additions and 7,689 deletions.
7 changes: 5 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
UltraScan is licensed under the LGPL v3 license.

Copyright Borries Demeler, Ph.D.
Copyright © Borries Demeler, Ph.D.
The University of Texas
****************************************************************************************

GNU LESSER GENERAL PUBLIC LICENSE

Version 3, 29 June 2007

Copyright 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Expand Down Expand Up @@ -148,3 +148,6 @@ whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the Library.

------------------------------------------------------------------------
Part of the source code includes code covered under a different license which
is LGPL v3 compliant. See the source code headers for detailed information.
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@ More information is available [here](https://ultrascan.aucsolutions.com)

The UltraScan project is supported by NIH Funding GM120600

### installation
### Licensing

This project is licensed under the Lesser General Public License (LGPL). You can find the LGPL license in the LICENSE file in the root directory of this project.

This project uses the Eigen library, which is licensed under the Mozilla Public License 2.0 (MPL2).
You can find the Eigen source code and license at [Eigen GitHub repository](https://gitlab.com/libeigen/eigen).

### Installation

The simplest way is to download and install a precompiled [binary](https://www.ultrascan3.aucsolutions.com/download.php)

### building
### Building

If you wish to compile from source, here are some notes to get you started.

Expand All @@ -21,7 +28,7 @@ One could also take hints from this [Dockerfile](https://github.com/ehb54/ultras

Please create an issue or [contact us](https://www.ultrascan3.aucsolutions.com/contacts.php) if you have further questions.

### container environment
### Container environment

Assuming you are experienced with containers...

Expand Down
Loading

0 comments on commit 9df106b

Please sign in to comment.