X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=gtkrun.js;h=fc8a9621668555ff65df4c9996fe960cb7674ada;hp=c16f5cfee4531c889545fb1a19875fd4f34d21df;hb=ada415c3d8f427e9078980a2205466ce032aefc8;hpb=7416a66cabc921c52ea52d01c1a14e45ad5a7789

diff --git a/gtkrun.js b/gtkrun.js
index c16f5cfee..fc8a96216 100644
--- a/gtkrun.js
+++ b/gtkrun.js
@@ -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;