Orgad Shaneh 7740c31746 Git: Increase delay for mergetool ...

On Windows it takes more than 500ms to retrieve the first line.

Really wait until we have an entire line then read.

Change-Id: I9f7c222c314ea977179ed549281ef145ba756c73
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

2015-09-30 10:01:44 +00:00

..

gerrit

Gerrit: Fix build

2015-06-10 16:25:32 +00:00

images

Git: Replace CloneWizard with a Json wizard

2015-05-18 13:43:39 +00:00

annotationhighlighter.cpp

Update License

2015-01-16 12:37:56 +01:00

annotationhighlighter.h

Git: Add override

2015-04-12 20:03:04 +00:00

branchadddialog.cpp

Git: Add override

2015-04-12 20:03:04 +00:00

branchadddialog.h

Update License

2015-01-16 12:37:56 +01:00

branchadddialog.ui

Git: added rename branch

2013-04-08 11:25:46 +02:00

branchcheckoutdialog.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

branchcheckoutdialog.h

Update License

2015-01-16 12:37:56 +01:00

branchcheckoutdialog.ui

Git: Fix dialog titles

2013-02-26 12:54:40 +01:00

branchdialog.cpp

Git: Fix source repository resolution in Stashes dialog

2015-08-12 11:32:20 +00:00

branchdialog.h

Update License

2015-01-16 12:37:56 +01:00

branchdialog.ui

Fix tooltips, add lacking dots

2014-03-13 12:06:27 +01:00

branchmodel.cpp

Vcs: Split up VcsCommand

2015-05-04 15:27:25 +00:00

branchmodel.h

Git: Add override

2015-04-12 20:03:04 +00:00

changeselectiondialog.cpp

Git: Use colors from theme

2015-04-17 11:56:23 +00:00

changeselectiondialog.h

Update License

2015-01-16 12:37:56 +01:00

changeselectiondialog.ui

Git: Set a title for change selection dialog

2014-01-16 17:08:41 +01:00

commitdata.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

commitdata.h

Update License

2015-01-16 12:37:56 +01:00

git_dependencies.pri

Qbs/qmake: Fix dependencies of plugins

2014-02-11 13:23:26 +01:00

Git.json.in

Update License

2015-01-16 12:37:56 +01:00

Git.mimetypes.xml

Git: Provide a real highlighter for interactive rebase

2013-06-03 10:40:32 +02:00

git.pro

Git: Replace CloneWizard with a Json wizard

2015-05-18 13:43:39 +00:00

git.qbs

Git: Replace CloneWizard with a Json wizard

2015-05-18 13:43:39 +00:00

git.qrc

Git: Replace CloneWizard with a Json wizard

2015-05-18 13:43:39 +00:00

gitclient.cpp

Git: Fix compilation with GCC 4.8

2015-09-10 18:49:37 +00:00

gitclient.h

Fix the getting of the Git author name when user.name isn't set

2015-07-01 16:02:25 +00:00

gitconstants.h

Update License

2015-01-16 12:37:56 +01:00

giteditor.cpp

Git: Strip line numbers from blame output

2015-07-07 08:50:50 +00:00

giteditor.h

Move "open" from IEditor to IDocument

2015-06-10 11:21:17 +00:00

githighlighters.cpp

Git: Fix detection of line with whitespace in commit highlighter

2015-06-11 08:59:54 +00:00

githighlighters.h

Git: Add override

2015-04-12 20:03:04 +00:00

gitplugin.cpp

Git: Remove last user of Core::Id::fromUniqueIdentifier

2015-06-23 13:34:09 +00:00

gitplugin.h

GitPlugin: reorder namespaces endin

2015-07-16 09:42:01 +00:00

gitsettings.cpp

Clean exported headers of the VcsBase plugin.

2015-02-26 10:57:52 +00:00

gitsettings.h

Update License

2015-01-16 12:37:56 +01:00

gitsubmiteditor.cpp

Git: Fix diff for renamed/copied file from commit editor

2015-04-21 10:43:27 +00:00

gitsubmiteditor.h

Add override keyword to IEditor & TextEditorWidget implementations

2015-06-09 04:17:42 +00:00

gitsubmiteditorwidget.cpp

Git: Use side-by-side layout for Fixup Previous Commit

2015-05-10 20:10:44 +00:00

gitsubmiteditorwidget.h

Git: Add override

2015-04-12 20:03:04 +00:00

gitsubmitpanel.ui

Fix placement of Bypass hooks checkbox

2014-08-11 12:45:16 +02:00

gitutils.cpp

Update License

2015-01-16 12:37:56 +01:00

gitutils.h

Update License

2015-01-16 12:37:56 +01:00

gitversioncontrol.cpp

Git: Make initial checkout more verbose

2015-05-18 12:11:04 +00:00

gitversioncontrol.h

IVersionControl: Add method to get a ShellCommand for initial checkouts

2015-05-11 11:51:53 +00:00

logchangedialog.cpp

Vcs: Split up VcsCommand

2015-05-04 15:27:25 +00:00

logchangedialog.h

Git: Add override

2015-04-12 20:03:04 +00:00

mergetool.cpp

Git: Increase delay for mergetool

2015-09-30 10:01:44 +00:00

mergetool.h

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

remoteadditiondialog.ui

Git: String updates

2011-05-13 14:56:31 +02:00

remotedialog.cpp

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

remotedialog.h

Update License

2015-01-16 12:37:56 +01:00

remotedialog.ui

Git: Remotedialog, replace QTableView with QTreeView

2014-06-20 15:41:07 +02:00

remotemodel.cpp

Update License

2015-01-16 12:37:56 +01:00

remotemodel.h

Git: Add override

2015-04-12 20:03:04 +00:00

settingspage.cpp

Vcs: Unify options pages for VcsBaseClientImpl based VCSes

2015-04-09 07:25:11 +00:00

settingspage.h

Vcs: Unify options pages for VcsBaseClientImpl based VCSes

2015-04-09 07:25:11 +00:00

settingspage.ui

Fix layouts for OSX: Set the obligatory ExpandingFieldsGrow

2015-02-24 11:45:53 +00:00

stashdialog.cpp

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

stashdialog.h

Update License

2015-01-16 12:37:56 +01:00

stashdialog.ui

Git: Fix keyboard activation in StashView

2014-04-14 12:08:16 +02:00

TODO.txt

Git: Update TODO file

2013-02-27 15:27:27 +01:00