Merge remote-tracking branch 'gnachman/adhoc_2.1.3' #268
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts:
.gitignore
CharacterRunInline.h
English.lproj/GlobalSearch.xib
English.lproj/PreferencePanel.xib
English.lproj/SplitPanel.xib
FutureMethods.h
FutureMethods.m
ITAddressBookMgr.m
NSStringITerm.m
PTYSession.h
PTYSession.m
PTYTask.m
PTYTextView.m
PTYWindow.h
PTYWindow.m
PasteboardHistory.h
PasteboardHistory.m
Popup.h
Popup.m
PreferencePanel.m
ProcessCache.m
ProfileListView.m
PseudoTerminal.h
PseudoTerminal.m
PseudoTerminalRestorer.m
ScreenChar.h
ScreenChar.m
TmuxController.m
TmuxDashboard.xib
TmuxGateway.m
ToolbeltView.m
UKCrashReporter/UKCrashReporter.m
VT100Screen.m
VT100Terminal.m
canary-iTerm.plist
iTerm.plist
iTerm.xcodeproj/project.pbxproj
iTermApplicationDelegate.m
iTermController.m
iTermGrowlDelegate.h
iTermGrowlDelegate.m
legacy-iTerm.plist
release-iTerm.plist
release.sh
version.txt