feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
7545ce072f64cd6b16f7663b0643fb0024bdeff1
qt-creator/src/plugins/git
History
Eike Ziller 7545ce072f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
2013-03-04 15:07:19 +01:00
..
gerrit
UI text: fix capitalization of Gerrit strings
2013-02-12 16:02:36 +01:00
gitorious
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
images
Add icons for checkout and clone wizards.
2010-05-19 18:40:45 +02:00
annotationhighlighter.cpp
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
annotationhighlighter.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
branchadddialog.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
branchadddialog.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
branchadddialog.ui
Git: Fix dialog titles
2013-02-26 12:54:40 +01:00
branchcheckoutdialog.cpp
Git: Auto stash for branches
2013-01-07 15:33:20 +01:00
branchcheckoutdialog.h
Git: Auto stash for branches
2013-01-07 15:33:20 +01:00
branchcheckoutdialog.ui
Git: Fix dialog titles
2013-02-26 12:54:40 +01:00
branchdialog.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
branchdialog.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
branchdialog.ui
Git: Added Merge and Rebase
2013-01-07 15:26:47 +01:00
branchmodel.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
branchmodel.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
changeselectiondialog.cpp
UI text: fix Git messages
2013-02-09 19:27:03 +01:00
changeselectiondialog.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
changeselectiondialog.ui
Git: Logically reorder fields in change selection dialog
2013-02-18 10:19:23 +01:00
clonewizard.cpp
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
clonewizard.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
clonewizardpage.cpp
Git: Simplify cloning of a specific branch
2013-02-18 20:18:39 +01:00
clonewizardpage.h
Git: Simplify cloning of a specific branch
2013-02-18 20:18:39 +01:00
commitdata.cpp
Git: Make file state resolving more accurate
2013-02-11 11:10:11 +01:00
commitdata.h
Git: Make file state resolving more accurate
2013-02-11 11:10:11 +01:00
Git.pluginspec.in
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
git.pro
Git: Rename ResetDialog -> LogChangeDialog
2013-03-01 15:24:07 +01:00
git.qbs
Git: Rename ResetDialog -> LogChangeDialog
2013-03-01 15:24:07 +01:00
git.qrc
Add icons for checkout and clone wizards.
2010-05-19 18:40:45 +02:00
gitclient.cpp
Merge remote-tracking branch 'origin/2.7'
2013-03-04 15:07:19 +01:00
gitclient.h
Git: Move some functions from MergeTool to GitClient
2013-03-01 15:25:35 +01:00
gitconstants.h
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
giteditor.cpp
Vcs: Remove "waiting for data" when process fails
2013-02-13 12:53:21 +01:00
giteditor.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
gitplugin.cpp
Merge remote-tracking branch 'origin/2.7'
2013-03-04 15:07:19 +01:00
gitplugin.h
Git: Require 1.7.2
2013-02-20 13:29:11 +01:00
gitsettings.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
gitsettings.h
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
gitsubmiteditor.cpp
Git: Close submit editor if all changes were committed externally
2013-03-01 11:25:22 +01:00
gitsubmiteditor.h
Git: Close submit editor if all changes were committed externally
2013-03-01 11:25:22 +01:00
gitsubmiteditorwidget.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
gitsubmiteditorwidget.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
gitsubmitpanel.ui
Git: Reorder fields in submit panel
2012-06-25 10:28:01 +02:00
gitutils.cpp
Git: Require 1.7.2
2013-02-20 13:29:11 +01:00
gitutils.h
Git: Require 1.7.2
2013-02-20 13:29:11 +01:00
gitversioncontrol.cpp
Git: Require 1.7.2
2013-02-20 13:29:11 +01:00
gitversioncontrol.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
logchangedialog.cpp
Git: Externally set dialog title for LogChangeDialog
2013-03-01 15:24:28 +01:00
logchangedialog.h
Git: Rename ResetDialog -> LogChangeDialog
2013-03-01 15:24:07 +01:00
mergetool.cpp
Git: Move some functions from MergeTool to GitClient
2013-03-01 15:25:35 +01:00
mergetool.h
Git: Move some functions from MergeTool to GitClient
2013-03-01 15:25:35 +01:00
remoteadditiondialog.ui
Git: String updates
2011-05-13 14:56:31 +02:00
remotedialog.cpp
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
remotedialog.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
remotedialog.ui
Git: Push to non-default remotes
2011-12-08 11:18:10 +01:00
remotemodel.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
remotemodel.h
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
settingspage.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
settingspage.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
settingspage.ui
Reduce height of version control settings pages.
2012-12-17 16:56:36 +01:00
stashdialog.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
stashdialog.h
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
stashdialog.ui
VCS[git]: Add support for stashes.
2010-01-15 12:28:22 +01:00
TODO.txt
Git: Update TODO file
2013-02-27 15:27:27 +01:00