aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLKedward <laurence.kedward@bristol.ac.uk>2021-03-06 10:51:20 +0000
committerLKedward <laurence.kedward@bristol.ac.uk>2021-03-06 10:51:20 +0000
commit0f5f02dbdfb1ab0987ef5613e4495a711b35b3cc (patch)
tree26eb833ef8d0f9ca0ece88ca8813501342845fd0
parentfcbab5d43956fc16370292fcb60a54dc6638a494 (diff)
parenta5fe8744ffd388b389c2a2b897b8b88c221175fb (diff)
downloadfpm-0f5f02dbdfb1ab0987ef5613e4495a711b35b3cc.tar.gz
fpm-0f5f02dbdfb1ab0987ef5613e4495a711b35b3cc.zip
Merge branch 'bump-version' into separate-targets
-rw-r--r--fpm/fpm.toml2
-rw-r--r--fpm/src/fpm_command_line.f902
2 files changed, 2 insertions, 2 deletions
diff --git a/fpm/fpm.toml b/fpm/fpm.toml
index 48f5b00..e28f2bc 100644
--- a/fpm/fpm.toml
+++ b/fpm/fpm.toml
@@ -1,5 +1,5 @@
name = "fpm"
-version = "0.1.3"
+version = "0.1.4"
license = "MIT"
author = "fpm maintainers"
maintainer = ""
diff --git a/fpm/src/fpm_command_line.f90 b/fpm/src/fpm_command_line.f90
index 4d184e4..ac0d595 100644
--- a/fpm/src/fpm_command_line.f90
+++ b/fpm/src/fpm_command_line.f90
@@ -130,7 +130,7 @@ contains
case default ; os_type = "OS Type: UNKNOWN"
end select
version_text = [character(len=80) :: &
- & 'Version: 0.1.3, alpha', &
+ & 'Version: 0.1.4, alpha', &
& 'Program: fpm(1)', &
& 'Description: A Fortran package manager and build system', &
& 'Home Page: https://github.com/fortran-lang/fpm', &