[gxml: 12/25] Merge remote-tracking branch 'upstream/master' into css-selectors
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml: 12/25] Merge remote-tracking branch 'upstream/master' into css-selectors
- Date: Tue, 19 Mar 2019 17:46:21 +0000 (UTC)
commit 7dd96c2dccd0fb84a8207888b59e998e2eef0640
Merge: df73128 1dcc740
Author: BZHDeveloper <inizan yannick gmail com>
Date: Tue Mar 5 22:15:29 2019 +0100
Merge remote-tracking branch 'upstream/master' into css-selectors
examples/vala/meson.build | 2 +-
gxml.doap | 2 +-
gxml/Collections.vala | 30 +--
gxml/GomCollections.vala | 168 +++------------
gxml/GomElement.vala | 2 +-
gxml/GomObject.vala | 14 +-
gxml/Parser.vala | 14 +-
gxml/Schema.vala | 2 +-
gxml/SerializableGeeArrayList.vala | 8 +-
gxml/SerializableGeeDualKeyMap.vala | 8 +-
gxml/SerializableGeeHashMap.vala | 8 +-
gxml/SerializableGeeTreeMap.vala | 2 +-
gxml/meson.build | 12 +-
meson.build | 4 +-
po/hu.po | 405 ++++++++++++++++++------------------
test/meson.build | 4 +-
16 files changed, 285 insertions(+), 400 deletions(-)
---
diff --cc gxml/meson.build
index a821064,1cad641..f04be68
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@@ -177,3 -177,7 +177,7 @@@ custom_target('typelib'
install: true,
install_dir: join_paths(get_option('libdir'), 'girepository-1.0'))
endif
+
+
+ libgxml_dep = declare_dependency(include_directories : inc_rooth_dep,
- link_with : libgxml)
++ link_with : libgxml)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]