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]
/
Builder3
/
About.js
diff --git
a/Builder3/About.js
b/Builder3/About.js
index
9a6e093
..
7becbf4
100644
(file)
--- a/
Builder3/About.js
+++ b/
Builder3/About.js
@@
-7,6
+7,11
@@
GObject = imports.gi.GObject;
GtkSource = imports.gi.GtkSource;
WebKit = imports.gi.WebKit;
Vte = imports.gi.Vte;
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({
console = imports.console;
XObject = imports.XObject.XObject;
About=new XObject({