Merge branch 'jb36242' into 'master'

Jb36242 See merge request !1
sailfishos · Sep 9, 2016 · 4732907 · 4732907
2 parents efdf31b + eac916a
commit 4732907
Show file tree

Hide file tree

Showing 1,774 changed files with 6 additions and 240,240 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "upstream"]
-	path = upstream
+[submodule "gobject-introspection"]
+	path = gobject-introspection
 	url = git://git.gnome.org/gobject-introspection
diff --git a/gobject-introspection b/gobject-introspection
diff --git a/gobject-introspection/.dir-locals.el b/gobject-introspection/.dir-locals.el
diff --git a/gobject-introspection/.gitignore b/gobject-introspection/.gitignore
diff --git a/gobject-introspection/AUTHORS b/gobject-introspection/AUTHORS
diff --git a/gobject-introspection/CONTRIBUTORS b/gobject-introspection/CONTRIBUTORS
diff --git a/gobject-introspection/COPYING b/gobject-introspection/COPYING