README.txt

[gitlive] / test_merger.js

diff --git a/test_merger.js b/test_merger.js
index 434aae2..e04bbd3 100644 (file)
--- a/test_merger.js
+++ b/test_merger.js
@@ -45,12 +45,7 @@ WebKit      = imports.gi.WebKit;
 Vte         = imports.gi.Vte;
 
  
-
-GtkClutter  = imports.gi.GtkClutter;
-
-if (GtkClutter) {    
-    GtkClutter.init(Seed.argv);
-}
+ 
 
 File    = imports.File.File;
 
@@ -61,12 +56,14 @@ Gtk.init(Seed.argv);
 
 imports.searchPath.push('/'); // allow global paths..
 // error checking todo..
- 
+ var ret = imports.Clones.Clones.show();
+ //imports.Merger.Merger.repo = new imports.Scm.Git.Repo.Repo('/home/alan/gitlive/roojs1');
 var ret = imports.Merger.Merger.show();
+
 print("show returned\n");
 print(JSON.stringify(ret,null, 4));
 
 
            
-Gtk.main();
+//Gtk.main();