[fractal: 2/2] Merge branch 'jcaesar/fractal-master'




commit ecde3e070cfb52f82197419e49cc44ba92b55ba5
Merge: d4ba46d4 9bc8279c
Author: Daniel GarcĂ­a Moreno <dani danigm net>
Date:   Mon Aug 3 08:20:43 2020 +0200

    Merge branch 'jcaesar/fractal-master'

 .gitignore                | 3 +++
 meson.build               | 2 +-
 subprojects/libhandy.wrap | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
---
diff --cc .gitignore
index a27d58dd,993e1957..7df7d264
--- a/.gitignore
+++ b/.gitignore
@@@ -11,8 -11,5 +11,11 @@@ vendo
  # Files configured by meson
  fractal-gtk/src/config.rs
  fractal-gtk/src/static_resources.rs
 +
+ subprojects/*
+ !subprojects/*.wrap
++
 +# Files created by Flatpak
 +.flatpak-builder/
 +fractal/
 +*.flatpak


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]