Commit 06a9ab47 authored by Maarten Billemont's avatar Maarten Billemont

Merge branch 'master' into rewrite

parents 6223320d 554c0129
Pipeline #33056963 failed with stage
in 10 minutes and 11 seconds
...@@ -16,6 +16,8 @@ DerivedData/ ...@@ -16,6 +16,8 @@ DerivedData/
# Generated # Generated
/platform-darwin/Podfile.lock /platform-darwin/Podfile.lock
/platform-darwin/Pods/ /platform-darwin/Pods/
/platform-darwin/Resources/Media/Images.xcassets/AppIcon.appiconset
/platform-darwin/Resources/Media/Images.xcassets/LaunchImage.launchimage
# Gradle # Gradle
build build
......
...@@ -2,7 +2,7 @@ allprojects { ...@@ -2,7 +2,7 @@ allprojects {
apply plugin: 'findbugs' apply plugin: 'findbugs'
group = 'com.lyndir.masterpassword' group = 'com.lyndir.masterpassword'
version = '2.7.9' version = '2.7.10'
tasks.withType( JavaCompile ) { tasks.withType( JavaCompile ) {
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
......
...@@ -1947,7 +1947,7 @@ ...@@ -1947,7 +1947,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = "/bin/sh -e"; shellPath = "/bin/sh -e";
shellScript = "exec Scripts/genassets"; shellScript = "exec Scripts/genassets\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
DAB7AE4C1F3D56AD00C856B1 /* ShellScript */ = { DAB7AE4C1F3D56AD00C856B1 /* ShellScript */ = {
......
Subproject commit ebd2c741fd11171eefa081792f9b14d6b2bac356 Subproject commit 110db0152ce66a4ab7b3831cc2dffc3496618f16
Markdown is supported
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