From: Alan Knowles <alan@akbkhome.com>
Date: Tue, 29 Mar 2011 09:46:38 +0000 (+0800)
Subject: Monitor.js
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=b6f26b43274fe220c41e4f305b2abad77776b465

Monitor.js
---

b6f26b43274fe220c41e4f305b2abad77776b465
diff --cc gitlive.js
index 4bbb7396,e393557b..0d567db5
--- a/gitlive.js
+++ b/gitlive.js
@@@ -9,20 -9,16 +9,28 @@@
  * 
  * 
  */
++<<<<<<< HEAD
 +GI      = imports.gi.GIRepository
 +GLib        = imports.gi.GLib;
 +
 +// we add this in, as it appears to get lost sometimes if we set it using the ENV. variable in builder.sh
 +GI.IRepository.prepend_search_path(GLib.get_home_dir() + '/.Builder/girepository-1.1');
 +
 +Gio      = imports.gi.Gio;
 +Gtk      = imports.gi.Gtk;
 +Notify = imports.gi.Notify;
++=======
+ var GI      = imports.gi.GIRepository;
+ var Gio      = imports.gi.Gio;
+ var GLib      = imports.gi.GLib;
+ var Gtk      = imports.gi.Gtk;
+ var Notify = imports.gi.Notify;
++>>>>>>> e9aa44647c32a34dfa368f7594ed72579c912bc3
  
- Spawn = imports.Spawn;
- Git = imports.Git;
- StatusIcon = imports.StatusIcon.StatusIcon;
- Monitor = imports.Monitor.Monitor;
+ var Spawn = imports.Spawn;
+ var Git = imports.Git;
+ var StatusIcon = imports.StatusIcon.StatusIcon;
+ var Monitor = imports.Monitor.Monitor;
  
  
  //File = imports[__script_path__+'/../introspection-doc-generator/File.js'].File
diff --cc tests/tickets.js
index 00000000,00000000..e69de29b
new file mode 100644
--- /dev/null
+++ b/tests/tickets.js