[phodav: 8/8] Merge branch 'misc' into 'master'
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [phodav: 8/8] Merge branch 'misc' into 'master'
- Date: Thu, 12 Mar 2020 00:10:02 +0000 (UTC)
commit a7f5651d9f461b332c8b2a6b21c9678cebd4bc31
Merge: 2fe6090 01dc4e5
Author: Marc-André Lureau <marcandre lureau gmail com>
Date: Thu Mar 12 00:09:10 2020 +0000
Merge branch 'misc' into 'master'
Misc build-sys & cleanups
See merge request GNOME/phodav!9
.gitlab-ci.yml | 4 +-
avahi-common.c => bin/avahi-common.c | 4 +-
avahi-common.h => bin/avahi-common.h | 7 ++-
{libphodav => bin}/chezdav.c | 0
{spice => bin}/map-drive.bat | 0
{spice => bin}/meson.build | 14 ++++++
{spice => bin}/output-queue.c | 0
{spice => bin}/output-queue.h | 0
{spice => bin}/spice-webdavd.c | 0
chezdav.wxs.in => data/chezdav.wxs.in | 0
make-msi.sh.in => data/make-msi.sh.in | 2 +-
data/meson.build | 54 ++++++++++++++++++++
spice-webdavd.wxs.in => data/spice-webdavd.wxs.in | 2 +-
libphodav/meson.build | 9 ----
meson.build | 60 +----------------------
15 files changed, 82 insertions(+), 74 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]