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

Snippets Groups Projects

Git: Flag conflict

Orgad Shaneh authored 13 years ago

Change-Id: I3518367afeeb27b4408f396daf3362ae76148846
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

82c7aac1

82c7aac1 13 years ago

Name	Last commit	Last update
..
gitorious
images
ScmGit.pluginspec.in
TODO.txt
annotationhighlighter.cpp
annotationhighlighter.h
branchadddialog.cpp
branchadddialog.h
branchadddialog.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.qrc
gitclient.cpp
gitclient.h
gitconstants.h
giteditor.cpp
giteditor.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
remoteadditiondialog.ui
remotedialog.cpp
remotedialog.h
remotedialog.ui
remotemodel.cpp
remotemodel.h
settingspage.cpp
settingspage.h
settingspage.ui
stashdialog.cpp
stashdialog.h
stashdialog.ui