Added a known issue for Trouter/Semantic History
Merge branch 'master' of github.com:chendo/iTerm2

* 'master' of github.com:chendo/iTerm2:
  Added a known issue for Trouter/Semantic History
Merge branch 'master' of github.com:gnachman/iTerm2

* 'master' of github.com:gnachman/iTerm2: (97 commits)
  Prevent cmd+key from sending 'key' to terminal if nothing catches cmd-key. Fixes bug 1136.
  Add locks to use of logHandle in PTYTask to fix race conditions.
  Fix bug where find highlights wouldn't wrap lines properly.
  Prevent infocmp from spamming stdout when a new session is created. Fixes bug 1118.
  Fix typo.
  Fix missing two pixels of background at top of screen in fullscreen mode. Fixes bug 1114.
  Performance improvements for Find. Convert positions to x,y ranges in batches. Cache block position in findSubstring:stopAt.
  Fix assertion in FontSizeEstimator.
  initial add.
  Handle control-pgup and control-pgdown. Fixes bug 1112.
  Change how font sizes are estimated by looking at all upper case letters' estimates and the actual bounds of 'X' to determine the bounding box. Looks at 'x' and 'y' to determine real descender. Fixes bug 1108. Also mostly fixes Consolas (though its baseline is still one pixel too low).
  Fix control+key for custom layouts. Fixes bug 1097.
  Show menu bar before creating a normal window. This prevents the miniaturize button from being hidden. Fixes bug 1088.
  optimize reverse search for long lines, which used to beachball. Fix crash when closing a window that is doing a search.
  Preserve collection behavior of fullscreen windows.
  Change label of Closing Hotkey Window May Switch Spaces. Turn it on by default. Addresses comment in bug 823.
  Version 1.0
  beta4
  remvoe some more logging.
  Remove excessive logging from hotkey window code
  ...
Merge branch 'master' of github.com:gnachman/iTerm2

* 'master' of github.com:gnachman/iTerm2:
  Add diff file for users who want to use XCode 4.
  Fix when building against 10.6 sdk
  Add lion fullscreens support. Remember window collection behavior for fullscreen windows.
  Revert "Add lion fullscreens support. Remember window collection behavior for fullscreen windows."
  Add lion fullscreens support. Remember window collection behavior for fullscreen windows.
Don't return a path if it doesn't exist.
Don't blindly assume that it's a URL
Semantic History now works with filenames with spaces!
Adding MRU iteration of tabs via Ctrl-Tab
Strip any trailing period or parenthesis from extracted path before parsing.

This fixes cmd-clicking of ActiveSupport deprecation warnings
  "DEPRECATION WARNING: something broke! (called from your_code.rb:1)"
Expand tildes in paths when cmd-clicking on paths.
Strip leading "a/" and "b/" from `diff` paths.
Updated the diff check to check for NULL instead
Merge branch 'master' of github.com:gnachman/iTerm2

* 'master' of github.com:gnachman/iTerm2: (21 commits)
  remove UI related to hold-cmd-for-tabs.
  Make dock and menu bar autohide in prelion fullscreen mode.
  Make tabview toggleable in fullscreen.
  fix Exposé display when blur effect is enabled
  release.sh
  Fix bug where startup activities aren't always performed on Lion.
  Improve technical correctness of dropping files. See bug 1176 comment 4 and 5.
  Add <Esc>]50;SetMark^G (inspired by bug 947) to set the mark.
  Remove trailing braces from filenames in trouter. Patch from bug 948.
  Expand tildes in trouter. Patch from bug 948.
  Add diff support to trouter (patch from bug 948)
  Apply patch from bug 1176 to handle pasting file names with strings better.
  Introduce a minimum delay between plays of the bell
  Fix some warnings, make it build for 10.5 sdk again.
  Use lighter scrollbar scolor when background is dark.
  Respect vertical only for zooming. Fix some bugs in previous attempt.
  Disregard 'zoom button maximizes vertically only' button.
  Check all ascii characters when measuring font's baseline to avoid brackets and underscores falling too low.
  Ignore hard newlines after terminating backslash. Apply patch in issue 1078.
  Add spaces back for lion (though it only kinda works).
  ...

Conflicts:
	Trouter.m
Cmd+Clicking URLs now works again
Updated the Xcode4 diff
Added a flag to ensure Semantic History's Cmd+Drag only gets checked once per drag
Removed diff of xcode4.diff from itself.
Replaced some NULLs with nils
Refactored diff path checking into getFullPath to make spaces work as well
URL encode the path so a valid URL gets created