AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added merge support

Browse Source 
FossilOrigin-Name: ac65fbf8d33a9e64fb97bd8652a43b4d11c8e538
This commit is contained in:
kostas
2015-05-03 11:44:04 +00:00
parent f9eda348be
commit cdba8c05f6
10 changed files with 186 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
manifest
View File

@ -1,5 +1,5 @@
C Fixed\sup-to-date\sworkspace\scheck\nAdded\sicons\sfor\stag\soperations
D 2015-05-03T10:26:29.811
C Added\smerge\ssupport
D 2015-05-03T11:44:04.852
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -196,19 +196,19 @@ F src/FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
F src/Fossil.cpp 46edbf48a7f09c0673136c726f62cf3e95e92f1e
F src/Fossil.h 7e45c12f80c06af78bf7a13cce75e0b105e0b99a
F src/Fossil.cpp 57363e0f487f325ba2eae6fdcf29756c9b1ae4a9
F src/Fossil.h fb34964797dc10cea02bdf2e3f2c97a74fddafc5
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp 032fec25b6f679d2863839095c9039ff4bf4b41d
F src/MainWindow.h dffe67ceb1d7a51b858ce8a0fb688bfa7e90c5be
F src/MainWindow.cpp 7ae75136eb3a2f867de4281cbe428a176c3d11c8
F src/MainWindow.h a4f3c753debe65d6231721c9948c4e8dee699021
F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
F src/UpdateDialog.cpp 5f9ff02aeed08ab3a69d0a9a3b3efeefbc38f3d4
F src/UpdateDialog.h 93c6ad9bd814f23e431c67bcd01928f33e10a80b
F src/UpdateDialog.cpp 08b0261de45babd947a0fbbd5af6bf8b58b74735
F src/UpdateDialog.h bf04816f3cc5425beaaca72ca05bcc793d4ca204
F src/Utils.cpp 748a58f19187aff7f3b867894129291cbe091678
F src/Utils.h 9cc125f59b8d46ff47bbde4c2cf9bc77f8e2553b
F src/Workspace.cpp 329b9ecd8363089b5fb230c0fd3606f2e9dab73a
F src/Workspace.cpp 12edd94656a0aaef20798f883b59af3074466cec
F src/Workspace.h 890fdb5f6b768809bc962374d22422dbfb6e89a1
F src/main.cpp 2ac8badc2a63fa123ceae53382ce24cfe1b5a54b
F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x
@ -219,8 +219,8 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui d4fc7971a0717677adb1be0bb88502dfcb92f5c4
F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
F ui/UpdateDialog.ui 636fd495d481ade1f20a65f79b538b9a49bbf1fa
P 72ac541c4c28f83c94c371f2d81e116b8f3cf261
R fd6aaebd153d8868db1e625f9440db3c
F ui/UpdateDialog.ui cd909f40c16e439181664e53bc3e86c2df647e3f
P 87468705beaaef842877ab8459e287a61edf4bc3
R 5791f89a3c32b1103d6b1aa0c81d25f4
U kostas
Z 43ffc6ff0a38aa6f520fbb26747d7238
Z 6e82b9757fd44eb9f7e8cfc7e84094f4