Branch: refs/heads/master
Home:   https://github.com/yi-editor/yi

Commit: a625267fc484e72291b7f7c05de4f247ca508a9d
    
https://github.com/yi-editor/yi/commit/a625267fc484e72291b7f7c05de4f247ca508a9d
Author: Jeff Wheeler <j...@jeffwheeler.name>
Date:   2011-03-20 (Sun, 20 Mar 2011)

Changed paths:
  R HACKING
  R LICENSE
  R Setup.hs
  R art/Makefile
  R art/c-source.png
  R art/dependencies.png
  R art/exposed-file-module.png
  R art/exposed-module.png
  R art/h-source.png
  R art/hidden-file-module.png
  R art/hidden-module.png
  R art/hs-source-folder.png
  R art/license-file.png
  R art/package.png
  R art/plain-folder.png
  R art/project.png
  R art/setup-script.png
  R art/text-file.png
  R art/yi+lambda-fat.128.png
  R art/yi+lambda-fat.16.png
  R art/yi+lambda-fat.32.png
  R art/yi+lambda-fat.64.png
  R art/yi+lambda-fat.ico
  R art/yi+lambda-fat.pdf
  R art/yi+lambda-fat.svg
  R art/yi+lambda.svg
  R attic/EmacsRebinding.hs
  R attic/testsuite/Tests/Buffer.hs
  R attic/testsuite/Tests/Core.hs
  R attic/testsuite/data
  A example-configs/yi-cua.hs
  A example-configs/yi-simple.hs
  A example-configs/yi-vim-snippets.hs
  A example-configs/yi-vim.hs
  A example-configs/yi.hs
  R examples/yi-cua.hs
  R examples/yi-simple.hs
  R examples/yi-vim-snippets.hs
  R examples/yi-vim.hs
  R examples/yi.hs
  R sketches/IncrementalParser.hs
  R sketches/IncrementalParser2.hs
  R sketches/Test.hs
  R src/Data/ByteRope.hs
  R src/Data/DelayList.hs
  R src/Data/Prototype.hs
  R src/Data/Rope.hs
  R src/Data/Trie.hs
  R src/Dummy.hs
  R src/Main.hs
  R src/Parser/Incremental.hs
  R src/ParserTest/ParserTest.hs
  R src/Shim/CabalInfo.hs
  R src/Shim/ExprSearch.hs
  R src/Shim/GhcCompat.hs
  R src/Shim/Hsinfo.hs
  R src/Shim/Messages.hs
  R src/Shim/MessagesTH.hs
  R src/Shim/ProjectContent.hs
  R src/Shim/SHM.hs
  R src/Shim/SessionMonad.hs
  R src/Shim/Udproxy.hs
  R src/Shim/Utils.hs
  R src/System/FriendlyPath.hs
  R src/Yi.hs
  R src/Yi/Boot.hs
  R src/Yi/Boot.hs-boot
  R src/Yi/Buffer.hs
  R src/Yi/Buffer/Basic.hs
  R src/Yi/Buffer/HighLevel.hs
  R src/Yi/Buffer/Implementation.hs
  R src/Yi/Buffer/Indent.hs
  R src/Yi/Buffer/Misc.hs
  R src/Yi/Buffer/Misc.hs-boot
  R src/Yi/Buffer/Normal.hs
  R src/Yi/Buffer/Region.hs
  R src/Yi/Buffer/Undo.hs
  R src/Yi/Char/Unicode.hs
  R src/Yi/Command.hs
  R src/Yi/Completion.hs
  R src/Yi/Config.hs
  R src/Yi/Config/Default.hs
  R src/Yi/Config/Misc.hs
  R src/Yi/Core.hs
  R src/Yi/Debug.hs
  R src/Yi/Dired.hs
  R src/Yi/Dynamic.hs
  R src/Yi/Editor.hs
  R src/Yi/Editor.hs-boot
  R src/Yi/Eval.hs
  R src/Yi/Event.hs
  R src/Yi/File.hs
  R src/Yi/File.hs-boot
  R src/Yi/GHC.hs
  R src/Yi/History.hs
  R src/Yi/Hoogle.hs
  R src/Yi/IReader.hs
  R src/Yi/IncrementalParse.hs
  R src/Yi/Interact.hs
  R src/Yi/Keymap.hs
  R src/Yi/Keymap.hs-boot
  R src/Yi/Keymap/Completion.hs
  R src/Yi/Keymap/Cua.hs
  R src/Yi/Keymap/Ee.hs
  R src/Yi/Keymap/Emacs.hs
  R src/Yi/Keymap/Emacs/KillRing.hs
  R src/Yi/Keymap/Emacs/Utils.hs
  R src/Yi/Keymap/Joe.hs
  R src/Yi/Keymap/Keys.hs
  R src/Yi/Keymap/Mg.hs
  R src/Yi/Keymap/Nano.hs
  R src/Yi/Keymap/Vi.hs
  R src/Yi/Keymap/Vim.hs
  R src/Yi/KillRing.hs
  R src/Yi/Lexer/Abella.x
  R src/Yi/Lexer/Alex.hs
  R src/Yi/Lexer/BasicTemplate.x
  R src/Yi/Lexer/C.x
  R src/Yi/Lexer/Cabal.x
  R src/Yi/Lexer/Compilation.x
  R src/Yi/Lexer/Cplusplus.x
  R src/Yi/Lexer/GNUMake.x
  R src/Yi/Lexer/Haskell.x
  R src/Yi/Lexer/JavaScript.x
  R src/Yi/Lexer/Latex.x
  R src/Yi/Lexer/LiterateHaskell.x
  R src/Yi/Lexer/OCaml.x
  R src/Yi/Lexer/ObjectiveC.x
  R src/Yi/Lexer/Ott.x
  R src/Yi/Lexer/Perl.x
  R src/Yi/Lexer/Python.x
  R src/Yi/Lexer/SVNCommit.x
  R src/Yi/Lexer/Srmc.x
  R src/Yi/Lexer/Whitespace.x
  R src/Yi/Lexer/common.hsinc
  R src/Yi/Main.hs
  R src/Yi/MiniBuffer.hs
  R src/Yi/Misc.hs
  R src/Yi/Mode/Abella.hs
  R src/Yi/Mode/Buffers.hs
  R src/Yi/Mode/Compilation.hs
  R src/Yi/Mode/Haskell.hs
  R src/Yi/Mode/Haskell/Dollarify.hs
  R src/Yi/Mode/IReader.hs
  R src/Yi/Mode/Interactive.hs
  R src/Yi/Mode/JavaScript.hs
  R src/Yi/Mode/Latex.hs
  R src/Yi/Mode/Shim.hs
  R src/Yi/Modes.hs
  R src/Yi/Monad.hs
  R src/Yi/Prelude.hs
  R src/Yi/Process.hs
  R src/Yi/Rectangle.hs
  R src/Yi/Regex.hs
  R src/Yi/Region.hs
  R src/Yi/Scion.hs
  R src/Yi/Search.hs
  R src/Yi/Snippets.hs
  R src/Yi/Snippets/Haskell.hs
  R src/Yi/String.hs
  R src/Yi/Style.hs
  R src/Yi/Style/Library.hs
  R src/Yi/Syntax.hs
  R src/Yi/Syntax/Driver.hs
  R src/Yi/Syntax/Haskell.hs
  R src/Yi/Syntax/JavaScript.hs
  R src/Yi/Syntax/Latex.hs
  R src/Yi/Syntax/Layout.hs
  R src/Yi/Syntax/OnlineTree.hs
  R src/Yi/Syntax/Paren.hs
  R src/Yi/Syntax/Strokes/Haskell.hs
  R src/Yi/Syntax/Tree.hs
  R src/Yi/Tag.hs
  R src/Yi/TextCompletion.hs
  R src/Yi/UI/Batch.hs
  R src/Yi/UI/Cocoa.hs
  R src/Yi/UI/Cocoa/Application.hs
  R src/Yi/UI/Cocoa/TextStorage.hs
  R src/Yi/UI/Cocoa/TextView.hs
  R src/Yi/UI/Cocoa/Utils.hs
  R src/Yi/UI/Common.hs
  R src/Yi/UI/Common.hs-boot
  R src/Yi/UI/Pango.hs
  R src/Yi/UI/Pango/Control.hs
  R src/Yi/UI/Pango/Gnome.hs
  R src/Yi/UI/Pango/ProjectTree.hs
  R src/Yi/UI/Pango/Utils.hs
  R src/Yi/UI/TabBar.hs
  R src/Yi/UI/Utils.hs
  R src/Yi/UI/Vte.hs
  R src/Yi/UI/Vty.hs
  R src/Yi/Verifier/JavaScript.hs
  R src/Yi/Window.hs
  R yi.cabal
  A yi/HACKING
  A yi/LICENSE
  A yi/Setup.hs
  A yi/art/Makefile
  A yi/art/c-source.png
  A yi/art/dependencies.png
  A yi/art/exposed-file-module.png
  A yi/art/exposed-module.png
  A yi/art/h-source.png
  A yi/art/hidden-file-module.png
  A yi/art/hidden-module.png
  A yi/art/hs-source-folder.png
  A yi/art/license-file.png
  A yi/art/package.png
  A yi/art/plain-folder.png
  A yi/art/project.png
  A yi/art/setup-script.png
  A yi/art/text-file.png
  A yi/art/yi+lambda-fat.128.png
  A yi/art/yi+lambda-fat.16.png
  A yi/art/yi+lambda-fat.32.png
  A yi/art/yi+lambda-fat.64.png
  A yi/art/yi+lambda-fat.ico
  A yi/art/yi+lambda-fat.pdf
  A yi/art/yi+lambda-fat.svg
  A yi/art/yi+lambda.svg
  A yi/sketches/IncrementalParser.hs
  A yi/sketches/IncrementalParser2.hs
  A yi/sketches/Test.hs
  A yi/src/Data/ByteRope.hs
  A yi/src/Data/DelayList.hs
  A yi/src/Data/Prototype.hs
  A yi/src/Data/Rope.hs
  A yi/src/Data/Trie.hs
  A yi/src/Dummy.hs
  A yi/src/Main.hs
  A yi/src/Parser/Incremental.hs
  A yi/src/ParserTest/ParserTest.hs
  A yi/src/Shim/CabalInfo.hs
  A yi/src/Shim/ExprSearch.hs
  A yi/src/Shim/GhcCompat.hs
  A yi/src/Shim/Hsinfo.hs
  A yi/src/Shim/Messages.hs
  A yi/src/Shim/MessagesTH.hs
  A yi/src/Shim/ProjectContent.hs
  A yi/src/Shim/SHM.hs
  A yi/src/Shim/SessionMonad.hs
  A yi/src/Shim/Udproxy.hs
  A yi/src/Shim/Utils.hs
  A yi/src/System/FriendlyPath.hs
  A yi/src/Yi.hs
  A yi/src/Yi/Boot.hs
  A yi/src/Yi/Boot.hs-boot
  A yi/src/Yi/Buffer.hs
  A yi/src/Yi/Buffer/Basic.hs
  A yi/src/Yi/Buffer/HighLevel.hs
  A yi/src/Yi/Buffer/Implementation.hs
  A yi/src/Yi/Buffer/Indent.hs
  A yi/src/Yi/Buffer/Misc.hs
  A yi/src/Yi/Buffer/Misc.hs-boot
  A yi/src/Yi/Buffer/Normal.hs
  A yi/src/Yi/Buffer/Region.hs
  A yi/src/Yi/Buffer/Undo.hs
  A yi/src/Yi/Char/Unicode.hs
  A yi/src/Yi/Command.hs
  A yi/src/Yi/Completion.hs
  A yi/src/Yi/Config.hs
  A yi/src/Yi/Config/Default.hs
  A yi/src/Yi/Config/Misc.hs
  A yi/src/Yi/Core.hs
  A yi/src/Yi/Debug.hs
  A yi/src/Yi/Dired.hs
  A yi/src/Yi/Dynamic.hs
  A yi/src/Yi/Editor.hs
  A yi/src/Yi/Editor.hs-boot
  A yi/src/Yi/Eval.hs
  A yi/src/Yi/Event.hs
  A yi/src/Yi/File.hs
  A yi/src/Yi/File.hs-boot
  A yi/src/Yi/GHC.hs
  A yi/src/Yi/History.hs
  A yi/src/Yi/Hoogle.hs
  A yi/src/Yi/IReader.hs
  A yi/src/Yi/IncrementalParse.hs
  A yi/src/Yi/Interact.hs
  A yi/src/Yi/Keymap.hs
  A yi/src/Yi/Keymap.hs-boot
  A yi/src/Yi/Keymap/Completion.hs
  A yi/src/Yi/Keymap/Cua.hs
  A yi/src/Yi/Keymap/Ee.hs
  A yi/src/Yi/Keymap/Emacs.hs
  A yi/src/Yi/Keymap/Emacs/KillRing.hs
  A yi/src/Yi/Keymap/Emacs/Utils.hs
  A yi/src/Yi/Keymap/Joe.hs
  A yi/src/Yi/Keymap/Keys.hs
  A yi/src/Yi/Keymap/Mg.hs
  A yi/src/Yi/Keymap/Nano.hs
  A yi/src/Yi/Keymap/Vi.hs
  A yi/src/Yi/Keymap/Vim.hs
  A yi/src/Yi/KillRing.hs
  A yi/src/Yi/Lexer/Abella.x
  A yi/src/Yi/Lexer/Alex.hs
  A yi/src/Yi/Lexer/BasicTemplate.x
  A yi/src/Yi/Lexer/C.x
  A yi/src/Yi/Lexer/Cabal.x
  A yi/src/Yi/Lexer/Compilation.x
  A yi/src/Yi/Lexer/Cplusplus.x
  A yi/src/Yi/Lexer/GNUMake.x
  A yi/src/Yi/Lexer/Haskell.x
  A yi/src/Yi/Lexer/JavaScript.x
  A yi/src/Yi/Lexer/Latex.x
  A yi/src/Yi/Lexer/LiterateHaskell.x
  A yi/src/Yi/Lexer/OCaml.x
  A yi/src/Yi/Lexer/ObjectiveC.x
  A yi/src/Yi/Lexer/Ott.x
  A yi/src/Yi/Lexer/Perl.x
  A yi/src/Yi/Lexer/Python.x
  A yi/src/Yi/Lexer/SVNCommit.x
  A yi/src/Yi/Lexer/Srmc.x
  A yi/src/Yi/Lexer/Whitespace.x
  A yi/src/Yi/Lexer/common.hsinc
  A yi/src/Yi/Main.hs
  A yi/src/Yi/MiniBuffer.hs
  A yi/src/Yi/Misc.hs
  A yi/src/Yi/Mode/Abella.hs
  A yi/src/Yi/Mode/Buffers.hs
  A yi/src/Yi/Mode/Compilation.hs
  A yi/src/Yi/Mode/Haskell.hs
  A yi/src/Yi/Mode/Haskell/Dollarify.hs
  A yi/src/Yi/Mode/IReader.hs
  A yi/src/Yi/Mode/Interactive.hs
  A yi/src/Yi/Mode/JavaScript.hs
  A yi/src/Yi/Mode/Latex.hs
  A yi/src/Yi/Mode/Shim.hs
  A yi/src/Yi/Modes.hs
  A yi/src/Yi/Monad.hs
  A yi/src/Yi/Prelude.hs
  A yi/src/Yi/Process.hs
  A yi/src/Yi/Rectangle.hs
  A yi/src/Yi/Regex.hs
  A yi/src/Yi/Region.hs
  A yi/src/Yi/Scion.hs
  A yi/src/Yi/Search.hs
  A yi/src/Yi/Snippets.hs
  A yi/src/Yi/Snippets/Haskell.hs
  A yi/src/Yi/String.hs
  A yi/src/Yi/Style.hs
  A yi/src/Yi/Style/Library.hs
  A yi/src/Yi/Syntax.hs
  A yi/src/Yi/Syntax/Driver.hs
  A yi/src/Yi/Syntax/Haskell.hs
  A yi/src/Yi/Syntax/JavaScript.hs
  A yi/src/Yi/Syntax/Latex.hs
  A yi/src/Yi/Syntax/Layout.hs
  A yi/src/Yi/Syntax/OnlineTree.hs
  A yi/src/Yi/Syntax/Paren.hs
  A yi/src/Yi/Syntax/Strokes/Haskell.hs
  A yi/src/Yi/Syntax/Tree.hs
  A yi/src/Yi/Tag.hs
  A yi/src/Yi/TextCompletion.hs
  A yi/src/Yi/UI/Batch.hs
  A yi/src/Yi/UI/Cocoa.hs
  A yi/src/Yi/UI/Cocoa/Application.hs
  A yi/src/Yi/UI/Cocoa/TextStorage.hs
  A yi/src/Yi/UI/Cocoa/TextView.hs
  A yi/src/Yi/UI/Cocoa/Utils.hs
  A yi/src/Yi/UI/Common.hs
  A yi/src/Yi/UI/Common.hs-boot
  A yi/src/Yi/UI/Pango.hs
  A yi/src/Yi/UI/Pango/Control.hs
  A yi/src/Yi/UI/Pango/Gnome.hs
  A yi/src/Yi/UI/Pango/ProjectTree.hs
  A yi/src/Yi/UI/Pango/Utils.hs
  A yi/src/Yi/UI/TabBar.hs
  A yi/src/Yi/UI/Utils.hs
  A yi/src/Yi/UI/Vte.hs
  A yi/src/Yi/UI/Vty.hs
  A yi/src/Yi/Verifier/JavaScript.hs
  A yi/src/Yi/Window.hs
  A yi/yi.cabal

Log Message:
-----------
Migrate yi core into yi/ subdirectory


Commit: 973fbccdf09b75062cb0c9f865a42483387b87a5
    
https://github.com/yi-editor/yi/commit/973fbccdf09b75062cb0c9f865a42483387b87a5
Author: Jeff Wheeler <j...@jeffwheeler.name>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  A frontends/cocoa/LICENSE
  A frontends/cocoa/src/Yi/UI/Cocoa.hs
  A frontends/cocoa/src/Yi/UI/Cocoa/Application.hs
  A frontends/cocoa/src/Yi/UI/Cocoa/TextStorage.hs
  A frontends/cocoa/src/Yi/UI/Cocoa/TextView.hs
  A frontends/cocoa/src/Yi/UI/Cocoa/Utils.hs
  A frontends/cocoa/yi-cocoa.cabal
  A frontends/pango/LICENSE
  A frontends/pango/src/Yi/UI/Pango.hs
  A frontends/pango/src/Yi/UI/Pango/Control.hs
  A frontends/pango/src/Yi/UI/Pango/Gnome.hs
  A frontends/pango/src/Yi/UI/Pango/ProjectTree.hs
  A frontends/pango/src/Yi/UI/Pango/Utils.hs
  A frontends/pango/yi-pango.cabal
  A frontends/vte/LICENSE
  A frontends/vte/src/Yi/UI/Vte.hs
  A frontends/vte/yi-vte.cabal
  A frontends/vty/LICENSE
  A frontends/vty/src/Yi/UI/Vty.hs
  A frontends/vty/yi-vty.cabal
  R yi/src/Yi/UI/Cocoa.hs
  R yi/src/Yi/UI/Cocoa/Application.hs
  R yi/src/Yi/UI/Cocoa/TextStorage.hs
  R yi/src/Yi/UI/Cocoa/TextView.hs
  R yi/src/Yi/UI/Cocoa/Utils.hs
  R yi/src/Yi/UI/Pango.hs
  R yi/src/Yi/UI/Pango/Control.hs
  R yi/src/Yi/UI/Pango/Gnome.hs
  R yi/src/Yi/UI/Pango/ProjectTree.hs
  R yi/src/Yi/UI/Pango/Utils.hs
  R yi/src/Yi/UI/Vte.hs
  R yi/src/Yi/UI/Vty.hs

Log Message:
-----------
Move frontends


Commit: 32fb55339e70dbd062267da2eef38597a4d8e4cc
    
https://github.com/yi-editor/yi/commit/32fb55339e70dbd062267da2eef38597a4d8e4cc
Author: Jeff Wheeler <j...@jeffwheeler.name>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  A yi-contrib/.gitignore
  A yi-contrib/LICENSE
  A yi-contrib/src/Yi/Config/Users/Anders.hs
  A yi-contrib/src/Yi/Config/Users/Cmcq.hs
  A yi-contrib/src/Yi/Config/Users/Corey.hs
  A yi-contrib/src/Yi/Config/Users/Ertai.hs
  A yi-contrib/src/Yi/Config/Users/Gwern.hs
  A yi-contrib/src/Yi/Config/Users/JP.hs
  A yi-contrib/src/Yi/Config/Users/JP/Experimental.hs
  A yi-contrib/src/Yi/Config/Users/Jeff.hs
  A yi-contrib/src/Yi/Style/Misc.hs
  A yi-contrib/src/Yi/Templates.hs
  A yi-contrib/yi-contrib.cabal

Log Message:
-----------
Bring yi-contrib back into main repo


Commit: 83b5f5fd19bee57faf7053c28f9d9ad48de87c11
    
https://github.com/yi-editor/yi/commit/83b5f5fd19bee57faf7053c28f9d9ad48de87c11
Author: Jeff Wheeler <j...@jeffwheeler.name>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M frontends/pango/src/Yi/UI/Pango.hs
  M yi/yi.cabal

Log Message:
-----------
Some migrations necessary for package split-up


Commit: c4bd75c1ec8a88a3896aaf7cd818e77120712431
    
https://github.com/yi-editor/yi/commit/c4bd75c1ec8a88a3896aaf7cd818e77120712431
Author: Jeff Wheeler <j...@jeffwheeler.name>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  R tests/Driver.hs
  R tests/TestSuite.hs
  R tests/data/Makefile
  R tests/data/haskell/1.hs
  R tests/data/haskell/10.hs
  R tests/data/haskell/11.hs
  R tests/data/haskell/12.hs
  R tests/data/haskell/13.hs
  R tests/data/haskell/14.hs
  R tests/data/haskell/15.hs
  R tests/data/haskell/2.hs
  R tests/data/haskell/3.hs
  R tests/data/haskell/4.hs
  R tests/data/haskell/5.hs
  R tests/data/haskell/6.hs
  R tests/data/haskell/7.hs
  R tests/data/haskell/8.hs
  R tests/data/haskell/9.hs
  R tests/data/haskell/LetColon.hs
  R tests/data/haskell/LetEqual.hs
  R tests/data/issue_187.txt
  R tests/data/issue_192/expected.txt
  R tests/data/issue_192/in.txt
  R tests/data/issue_233.pl
  R tests/data/perl_excerpts.pl
  A yi/tests/Driver.hs
  A yi/tests/TestSuite.hs
  A yi/tests/data/Makefile
  A yi/tests/data/haskell/1.hs
  A yi/tests/data/haskell/10.hs
  A yi/tests/data/haskell/11.hs
  A yi/tests/data/haskell/12.hs
  A yi/tests/data/haskell/13.hs
  A yi/tests/data/haskell/14.hs
  A yi/tests/data/haskell/15.hs
  A yi/tests/data/haskell/2.hs
  A yi/tests/data/haskell/3.hs
  A yi/tests/data/haskell/4.hs
  A yi/tests/data/haskell/5.hs
  A yi/tests/data/haskell/6.hs
  A yi/tests/data/haskell/7.hs
  A yi/tests/data/haskell/8.hs
  A yi/tests/data/haskell/9.hs
  A yi/tests/data/haskell/LetColon.hs
  A yi/tests/data/haskell/LetEqual.hs
  A yi/tests/data/issue_187.txt
  A yi/tests/data/issue_192/expected.txt
  A yi/tests/data/issue_192/in.txt
  A yi/tests/data/issue_233.pl
  A yi/tests/data/perl_excerpts.pl

Log Message:
-----------
Move tests


Commit: 2f46431fdd74215f9f324b4b77a6bd9bb3e68a3c
    
https://github.com/yi-editor/yi/commit/2f46431fdd74215f9f324b4b77a6bd9bb3e68a3c
Author: Jeff Wheeler <j...@jeffwheeler.name>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M frontends/pango/yi-pango.cabal

Log Message:
-----------
For yi-pango, depend on gconf for -fgnome


Commit: b321f753f7511f9aa3848e9de2d568b0d3e0f9e5
    
https://github.com/yi-editor/yi/commit/b321f753f7511f9aa3848e9de2d568b0d3e0f9e5
Author: Jeff Wheeler <j...@jeffwheeler.name>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M Makefile
  M yi/src/Yi/Dired.hs

Log Message:
-----------
Merge conflicts


Compare: https://github.com/yi-editor/yi/compare/2431f98...b321f75

-- 
Yi development mailing list
yi-devel@googlegroups.com
http://groups.google.com/group/yi-devel

Reply via email to