<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>a32c1de2cd1e59da3174fd7f35e59fbc34309358</id>
    </parent>
    <parent>
      <id>7052c3d53a7fd70e698c7fc2236ecfa3561f5b93</id>
    </parent>
  </parents>
  <author>
    <name>kana</name>
    <email>nicht@s8.xrea.com</email>
  </author>
  <url>http://github.com/kana/config/commit/3795c58578e3fd4874dac7115dd89ffb52ae0c87</url>
  <id>3795c58578e3fd4874dac7115dd89ffb52ae0c87</id>
  <committed-date>2009-11-11T07:42:17-08:00</committed-date>
  <authored-date>2009-11-11T07:42:17-08:00</authored-date>
  <message>Merge branch 'vim-fakeclip'

* vim-fakeclip: (21 commits)
  vim: fakeclip: Mark as version 0.2.5
  vim: fakeclip: Support tmux
  vim: fakeclip: Fix a bug to yank into pastebuffer
  vim: fakeclip: Refactor on paste buffer
  vim: fakeclip: Revise terms on GNU screen
  vim: fakeclip: Support X Window System by xclip
  vim: fakeclip: Add a note to read from GNU screen
  vim: fakeclip: Add tests on GNU screen
  vim: fakeclip: Prepare for tests
  vim: vspec: Add :SaveContext and :ResetContext
  vim: vspec: Fix dependency on tests
  vim: vspec: Add test for tools / Fix bugs on tools
  vim: vspec: Add type check for regexp matchers
  vim: vspec: Fix the name of a test
  vim: vspec: Add type check for ordering matchers
  vim: vspec: Add type checks for equality matchers
  vim: vspec: Improve message on failure
  vim: vspec: Add tests, fix many mistakes
  vim: vspec: Add test - 'no-test'
  vim: vspec: Fix minor typos
  ...

Conflicts:
	Makefile
	vim/dot.vim/doc/fakeclip.txt</message>
  <tree>50bce15ff6bfaac74a9b2ce437aec0121739f019</tree>
  <committer>
    <name>kana</name>
    <email>nicht@s8.xrea.com</email>
  </committer>
</commit>
