Fix merge conflicts
Reset scroll margins and move cursor to (1, 1) when the terminal receives DECALN
Merge pull request #136 from saitoha/reset-margins-on-decaln

Fix DECALN behavior
Add drawing performance logging
Merge branch 'master' of https://github.com/gnachman/iTerm2
Update sparkle to latest from Andy's repo as of today
Get ready for nightly auto updates to test new sparkle
Add files that should have been in the last commit
Merge branch 'master' of https://github.com/gnachman/iTerm2
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.