projects
/
app.Builder.js
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Builder/Provider/File/Gtk.js
[app.Builder.js]
/
gtkrun.js
diff --git
a/gtkrun.js
b/gtkrun.js
index
5095531
..
fc8a962
100644
(file)
--- a/
gtkrun.js
+++ b/
gtkrun.js
@@
-48,9
+48,15
@@
Vte = imports.gi.Vte;
//GtkClutter = imports.gi.GtkClutter;
//GtkClutter = imports.gi.GtkClutter;
+<<<<<<< HEAD
+//if (GtkClutter) {
+// GtkClutter.init(Seed.argv);
+//}
+=======
if (typeof(GtkClutter) != 'undefined') {
GtkClutter.init(Seed.argv);
}
if (typeof(GtkClutter) != 'undefined') {
GtkClutter.init(Seed.argv);
}
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
File = imports.File.File;
File = imports.File.File;