src/plugins/git · 2678662fb492d1cf5340894a6f7112fbd2e2c6a8 · Marco Bubke / flatpak-qt-creator · GitLab

Snippets Groups Projects

Merge remote-tracking branch 'origin/3.0'

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

Change-Id: If62ec06ea069a7eba6735101e5334b0c1f66861f

cdd19fe6

cdd19fe6 11 years ago

Name	Last commit	Last update
..
gerrit
gitorious
images
Git.mimetypes.xml
Git.pluginspec.in
TODO.txt
annotationhighlighter.cpp
annotationhighlighter.h
branchadddialog.cpp
branchadddialog.h
branchadddialog.ui
branchcheckoutdialog.cpp
branchcheckoutdialog.h
branchcheckoutdialog.ui
branchdialog.cpp
branchdialog.h
branchdialog.ui
branchmodel.cpp
branchmodel.h
changeselectiondialog.cpp
changeselectiondialog.h
changeselectiondialog.ui
clonewizard.cpp
clonewizard.h
clonewizardpage.cpp
clonewizardpage.h
commitdata.cpp
commitdata.h
git.pro
git.qbs
git.qrc
git_dependencies.pri
gitclient.cpp
gitclient.h
gitconstants.h
giteditor.cpp
giteditor.h
githighlighters.cpp
githighlighters.h
gitplugin.cpp
gitplugin.h
gitsettings.cpp
gitsettings.h
gitsubmiteditor.cpp
gitsubmiteditor.h
gitsubmiteditorwidget.cpp
gitsubmiteditorwidget.h
gitsubmitpanel.ui
gitutils.cpp
gitutils.h
gitversioncontrol.cpp
gitversioncontrol.h
logchangedialog.cpp
logchangedialog.h
mergetool.cpp
mergetool.h
remoteadditiondialog.ui
remotedialog.cpp
remotedialog.h
remotedialog.ui
remotemodel.cpp
remotemodel.h
settingspage.cpp
settingspage.h
settingspage.ui
stashdialog.cpp
stashdialog.h
stashdialog.ui