Merge pull request #881 from andreasb242/master

Small fixes
presentation
andreasb242 7 years ago committed by GitHub
commit b6ed6021e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .settings/language.settings.xml
  2. 4
      build-flatpack.sh
  3. 2
      src/control/settings/Settings.cpp

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.autotools.core.LibtoolGCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="559095970974206506" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="587297783307056298" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

@ -0,0 +1,4 @@
#!/bin/bash
flatpak-builder ./flatpak-build org.github.xournalpp.xournalpp.yaml --force-clean --repo=./repo
flatpak build-bundle ./repo xournalpp.flatpak com.github.xournalpp.xournalpp

@ -56,7 +56,7 @@ void Settings::loadDefault()
this->layoutRightToLeft = false;
this->layoutBottomToTop = false;
this->numPairsOffset = 0;
this->numPairsOffset = 1;
this->displayDpi = 72;

Loading…
Cancel
Save