From 1b42be673b2cd237ce873df9f4b0b339aab9518a Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Thu, 29 Nov 2012 17:15:35 +0000
Subject: Merge system-3.4 and 3.6

---
(limited to 'config/modules/system.json')

diff --git a/config/modules/system.json b/config/modules/system.json
new file mode 100644
index 0000000..2f3b73f
--- /dev/null
+++ b/config/modules/system.json
@@ -0,0 +1,91 @@
+[
+    {
+        "branch": "2.34.2", 
+        "name": "glib", 
+        "options": [
+            "--disable-modular-tests"
+        ], 
+        "repo": "git://git.gnome.org/glib"
+    }, 
+    {
+        "branch": "GOBJECT_INTROSPECTION_1_34_1_1", 
+        "name": "gobject-introspection", 
+        "options": [
+            "--disable-tests"
+        ], 
+        "repo": "git://git.gnome.org/gobject-introspection"
+    }, 
+    {
+        "branch": "776088b4d673183264893cf40bd3e4e359ba7a5", 
+        "name": "pygobject", 
+        "repo": "git://git.gnome.org/pygobject"
+    }, 
+    {
+        "branch": "ATK_2_6_0", 
+        "if": "gnome_version == '3.4'", 
+        "name": "atk", 
+        "repo": "git://git.gnome.org/atk"
+    }, 
+    {
+        "branch": "AT_SPI2_CORE_2_6_1", 
+        "if": "gnome_version == '3.4'", 
+        "name": "at-spi2-core", 
+        "repo": "git://git.gnome.org/at-spi2-core"
+    }, 
+    {
+        "branch": "AT_SPI2_ATK_2_6_1", 
+        "if": "gnome_version == '3.4'", 
+        "name": "at-spi2-atk", 
+        "repo": "git://git.gnome.org/at-spi2-atk"
+    }, 
+    {
+        "branch": "3.6.1", 
+        "if": "gnome_version == '3.4'", 
+        "name": "gtk+", 
+        "repo": "git://git.gnome.org/gtk+"
+    }, 
+    {
+        "branch": "1.0.2", 
+        "if": "gstreamer_version != '1.0'", 
+        "name": "gstreamer", 
+        "options": [
+            "--disable-gtk-doc"
+        ], 
+        "out-of-source": false, 
+        "repo": "git://anongit.freedesktop.org/gstreamer/gstreamer"
+    }, 
+    {
+        "branch": "1.0.2", 
+        "if": "gstreamer_version != '1.0'", 
+        "name": "gst-plugins-base", 
+        "options": [
+            "--disable-gtk-doc"
+        ], 
+        "out-of-source": false, 
+        "repo": "git://anongit.freedesktop.org/gstreamer/gst-plugins-base"
+    }, 
+    {
+        "branch": "1.0.2", 
+        "if": "gstreamer_version != '1.0'", 
+        "name": "gst-plugins-good", 
+        "options": [
+            "--disable-gtk-doc"
+        ], 
+        "out-of-source": false, 
+        "repo": "git://anongit.freedesktop.org/gstreamer/gst-plugins-good"
+    }, 
+    {
+        "branch": "libxklavier-5.3", 
+        "if": "gnome_version == '3.4'", 
+        "name": "libxklavier", 
+        "repo": "git://anongit.freedesktop.org/libxklavier"
+    }, 
+    {
+        "branch": "METACITY_2_34_13", 
+        "name": "metacity", 
+        "options": [
+            "--disable-themes-documentation"
+        ], 
+        "repo": "git://git.gnome.org/metacity"
+    }
+]
--
cgit v0.9.1