diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-04-19 16:36:45 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-04-19 16:36:45 -0500 |
| commit | 213a9b78cf39776c3832983e9d9c26435bad2282 (patch) | |
| tree | af3bb8662dd4203fcfbd071f005e0619096f61ee /src/main/resources | |
| parent | 9c30c3ad4d4658964e2bb2bb5be6c2eebbfbe8af (diff) | |
| parent | 8cc60583134a4d01e9967424e5a51332de6cc38b (diff) | |
Merge branch 'gui-redesign-0.4' into developv0.4.0a1
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/about.txt | 2 | ||||
| -rw-r--r-- | src/main/resources/dimensionfile.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/resources/about.txt b/src/main/resources/about.txt index f175396..7780db3 100644 --- a/src/main/resources/about.txt +++ b/src/main/resources/about.txt @@ -2,7 +2,7 @@ About 7Units v[VERSION] Copyright Notice: -Unit Converter Copyright (C) 2018-2021 Adrien Hopkins +Unit Converter Copyright (C) 2018-2022 Adrien Hopkins This program comes with ABSOLUTELY NO WARRANTY; for details read the LICENSE file, section 15 diff --git a/src/main/resources/dimensionfile.txt b/src/main/resources/dimensionfile.txt index 3485de5..a946677 100644 --- a/src/main/resources/dimensionfile.txt +++ b/src/main/resources/dimensionfile.txt @@ -12,7 +12,7 @@ TIME ! TEMPERATURE ! # Derived Dimensions -AREA LENGTH^2 -VOLUME LENGTH^3 -VELOCITY LENGTH / TIME -ENERGY MASS * VELOCITY^2
\ No newline at end of file +Area LENGTH^2 +Volume LENGTH^3 +Velocity LENGTH / TIME +Energy MASS * Velocity^2
\ No newline at end of file |