<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>site-lisp/cucumber</filename>
    </added>
    <added>
      <filename>site-lisp/ioke/inf-ioke.el</filename>
    </added>
    <added>
      <filename>site-lisp/ioke/ioke-mode.el</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -8,6 +8,8 @@
 (add-to-list 'load-path &quot;~/emacs/site-lisp/scala&quot;)
 (add-to-list 'load-path &quot;~/emacs/site-lisp/groovy&quot;)
 (add-to-list 'load-path &quot;~/emacs/site-lisp/gist&quot;)
+(add-to-list 'load-path &quot;~/emacs/site-lisp/ioke&quot;)
+(add-to-list 'load-path &quot;~/emacs/site-lisp/cucumber&quot;)
 (add-to-list 'load-path &quot;~/emacs/local&quot;)
 
 (load &quot;andreaja-modules&quot;)
@@ -17,9 +19,11 @@
 (load &quot;local-settings&quot;)
 (load &quot;local-tramp&quot;)
 (load &quot;visual-basic-mode&quot;)
+(load &quot;ioke-mode&quot;)
 
 (load &quot;local-functions&quot;)
 (load &quot;local-key-bindings&quot;)
+(load &quot;feature-mode&quot;)
 
 (setq custom-file &quot;~/emacs/settings.el&quot;)
 (load custom-file 'noerror)</diff>
      <filename>loadenv.el</filename>
    </modified>
    <modified>
      <diff>@@ -8,6 +8,10 @@
 
 (setq-default indent-tabs-mode nil)
 
+(global-hl-line-mode t)
+
+(scroll-bar-mode nil)
+
 ;; perl stuff
 
 (setq-default perl-tab-always-indent 1)</diff>
      <filename>local/andreaja-minor-modes.el</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d0dc13cbb05987aa61a7218f6ce71ddc3aecc7c5</id>
    </parent>
    <parent>
      <id>f1670ea5c9abc71c3b3f829b6fc6a153adc8fa7e</id>
    </parent>
  </parents>
  <author>
    <name>Andreas Jacobsen</name>
    <email>andreaja@ifi.uio.no</email>
  </author>
  <url>http://github.com/andreaja/dotemacs/commit/32afa4eb8736eb5d5fb76b3c0518185f1e9a9cb7</url>
  <id>32afa4eb8736eb5d5fb76b3c0518185f1e9a9cb7</id>
  <committed-date>2009-10-22T02:08:41-07:00</committed-date>
  <authored-date>2009-10-22T02:08:41-07:00</authored-date>
  <message>Merge branch 'master' of git@github.com:andreaja/dotemacs

Conflicts:
	loadenv.el
	local/andreaja-minor-modes.el</message>
  <tree>e8e7bdfef88be8f1919bad46199111414a608cd5</tree>
  <committer>
    <name>Andreas Jacobsen</name>
    <email>andreaja@ifi.uio.no</email>
  </committer>
</commit>
