Fix merge conflicts
Add option to log drawing performance
Changed pasting of files to be joined by a space rather than new line.

The functionality of Mac OS X's default terminal is to paste files joined by a space. This is for a very good reason.

Main uses include:
1. Pasting multiple files as arguments to rm to remove each file.
2. Pasting multiple files as arguments to other commands.

The only thing I can think of it being useful to paste with new lines are...
1. If you have a bunch of scripts which you want to run, you copy them and paste.

There is an easy workaround for this though. You can open a text editor, paste the files in there, copy and paste back into iTerm.
When a preset is added or removed, make sure it affect all preference panels
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2
Add bonjour verbose logging
Resolve merges
Merge pull request #138 from GRMrGecko/patch-1

Changed pasting of files to be joined by a space rather than new line.
Add run coprocess as trouter action
Move the cursor to the home position when DECOM is set or reset
Fix merge conflicts
Add ability to draw parts of lines. Make each char's dirty flag be just a bit and not a bitmask.
Fix warnings
Fix ipv6 support
Fix ipv6 support
Merge pull request #140 from saitoha/fix-origin-mode-behavior

Move the cursor to the home position when DECOM is set or reset
Add debug logging to event monitor view and pointer prefs controller
Merge branch 'master' of https://github.com/gnachman/iTerm2
Fix bug with cursor drawing and double width chars. Not enough cells were marked dirty, and when drawing a single cell in _drawLine and that cell was a DWC nothing got drawn because of the ugly hackery in _drawLine.
Show overlay scrollbars in fullscreen. The build is officially 10.7+ now