Builder/Provider/File/Gtk.js

diff --cc Builder3/About.js
index 3eead26,9a6e093..7becbf4
--- 1/Builder3/About.js
--- 2/Builder3/About.js
+++ b/Builder3/About.js
@@@ -7,8 -7,6 +7,11 @@@ GObject = imports.gi.GObject
  GtkSource = imports.gi.GtkSource;
  WebKit = imports.gi.WebKit;
  Vte = imports.gi.Vte;
++<<<<<<< HEAD
 +//GtkClutter = imports.gi.GtkClutter;
 +//Gdl = imports.gi.Gdl;
++=======
++>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
  console = imports.console;
  XObject = imports.XObject.XObject;
  About=new XObject({

diff --cc Builder3/Editor.js
index 18bfb09,d9bd20b..9c4f0e1
--- 1/Builder3/Editor.js
--- 2/Builder3/Editor.js
+++ b/Builder3/Editor.js
@@@ -7,7 -7,6 +7,10 @@@ GObject = imports.gi.GObject
  GtkSource = imports.gi.GtkSource;
  WebKit = imports.gi.WebKit;
  Vte = imports.gi.Vte;
++<<<<<<< HEAD
 +//GtkClutter = imports.gi.GtkClutter;
++=======
++>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
   console = imports.console;
  XObject = imports.XObject.XObject;
  Editor=new XObject({

diff --cc Builder3/RooProjectProperties.js
index 9b24d85,6db9a8d..e3ad358
--- 1/Builder3/RooProjectProperties.js
--- 2/Builder3/RooProjectProperties.js
+++ b/Builder3/RooProjectProperties.js
@@@ -7,7 -7,6 +7,10 @@@ GObject = imports.gi.GObject
  GtkSource = imports.gi.GtkSource;
  WebKit = imports.gi.WebKit;
  Vte = imports.gi.Vte;
++<<<<<<< HEAD
 +//GtkClutter = imports.gi.GtkClutter;
++=======
++>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
  //Gdl = imports.gi.Gdl;
  console = imports.console;
  XObject = imports.XObject.XObject;

diff --cc gtkrun.js
index c16f5cf,5095531..fc8a962
--- 1/gtkrun.js
--- 2/gtkrun.js
+++ b/gtkrun.js
@@@ -48,9 -48,9 +48,15 @@@ Vte         = imports.gi.Vte
  
  //GtkClutter  = imports.gi.GtkClutter;
  
++<<<<<<< HEAD
 +//if (GtkClutter) {    
 +//    GtkClutter.init(Seed.argv);
 +//}
++=======
+ if (typeof(GtkClutter) != 'undefined') {    
+     GtkClutter.init(Seed.argv);
+ }
++>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
  
  File    = imports.File.File;
  

diff --cc install1.2.sh
index 9b253cd,54bef1f..e70a069
--- 1/install1.2.sh
--- 2/install1.2.sh
+++ b/install1.2.sh
@@@ -1,10 -1,10 +1,18 @@@
  #!/bin/sh
++<<<<<<< HEAD
 + 
 +#git clone git://github.com/roojs/gir-1.2-gtk-2.0.git gir-1.2
++=======
+ #git clone git://github.com/roojs/gir-1.2-gtk-3.0.git gir-1.2
++>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
  
  #// compile GIR's
  mkdir -p ~/.Builder/girepository-1.2 || false
   
++<<<<<<< HEAD
++=======
+  
++>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
  ls gir-1.2 | sed s/.gir// | awk \
      '{ print "g-ir-compiler  gir-1.2/" $1 ".gir --includedir=gir-1.2 -o  ~/.Builder/girepository-1.2/" $1 ".typelib" }' \
      | sh -x