AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
fuel-scm/manifest
Kostas 559664f021 Removed all path conversion for the gdiff and gmerge settings. 
The settings are now stored in the platform native format. This should fix the issue where fuel was providing fossil with an incorrect command line for the gmerge setting

FossilOrigin-Name: c57c6d52cc3314fdf7a261ec5d23f84da7cb55ea
2014-08-06 10:06:10 +00:00

208 lines
15 KiB
Plaintext
Raw Blame History

C Removed\sall\spath\sconversion\sfor\sthe\sgdiff\sand\sgmerge\ssettings.\nThe\ssettings\sare\snow\sstored\sin\sthe\splatform\snative\sformat.\sThis\sshould\sfix\sthe\sissue\swhere\sfuel\swas\sproviding\sfossil\swith\san\sincorrect\scommand\sline\sfor\sthe\sgmerge\ssetting
D 2014-08-06T10:06:10.992
F dist/arch/PKGBUILD 1d72dad77767f94a6b1a018067188e61927fa564
F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381
F doc/Changes.txt 99e6d8e4a534f48a1ced8477d27c847ae2b6a708
F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
F fuel.pro d15cce9435cf605947ae41e53869020e90563336
F intl/convert.bat 90152e8b17c9c9bd79d8bf99fa70b9c4258064ec x
F intl/convert.sh 5694496585ff5f4363c90ff8b6f48e19e0b6b4aa x
F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741
F intl/el_GR.ts 1b805ee57309d02059d9e3e4cb49d945f9d9ac82
F intl/en_US.ts 7917816efedf35d5f4f798d18896d7aa0cb3c71b
F intl/es_ES.ts fbddd3374f7999e602536de9870ae1fef0c28ea8
F intl/fr_FR.ts 8d2c00ab00927ee5239c1d273f380bbe4cfb2464
F intl/ru_RU.ts 74189b3ee2b30b0b47b2db5bd7c9935db84947fc
F intl/update.sh b5312e108eec47f9c8cb7d6790c57335e6b52829 x
F rsrc/fuel.desktop 43145556bc61f5a91b497c38a16aec44af271d29
F rsrc/fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79
F rsrc/icons/Address\sBook-01.png ef2cec80ea5a559b72e8be4a344a1869fe69cbd8
F rsrc/icons/Adobe\sIllustrator\sCS3\sDocument-01.png 2e44e933d58eefee7ccfa1650fed4ceadcf3c2be
F rsrc/icons/Adobe\sPDF\sDocument-01.png 8a0bc3ba633d08debde748d64b5a9675e30447a3
F rsrc/icons/Adobe\sPhotoshop\sCS3\sDocument-01.png 2adf660fad1e339e4a5dc0fded32902ba7e98379
F rsrc/icons/Battery-01.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
F rsrc/icons/Binoculars-01.png 386d0f3f9fa5b80a0abb650b3704bb450434d44f
F rsrc/icons/Book-01.png 07fc552ba34b69f4d038dfe57f23be211405ed27
F rsrc/icons/Briefcase-01.png 43cc1bb663f3470303cd94b473128f44754fcffa
F rsrc/icons/Button\sAdd-01.png e256fcdf5f374e58f0731ef500e7cd3117a7b6ec
F rsrc/icons/Button\sBlank\sBlue-01.png 1935637b553ca06c5187ef7fc52f90536c989f07
F rsrc/icons/Button\sBlank\sGray-01.png 2758d7f21d1fe39f5fb942fcb1c4b8aafe5eb61e
F rsrc/icons/Button\sBlank\sGreen-01.png 75ba0e98d49367f364cf4138825fb94a1acbe947
F rsrc/icons/Button\sBlank\sRed-01.png 9126ac9058892f2ea02589a458ebb1910a88d6a4
F rsrc/icons/Button\sBlank\sYellow-01.png c99b31de0194cc4a569d6286ffdc6c63237b7e80
F rsrc/icons/Button\sCancel-01.png 18ca405914aa4af713432bc2e440e34f8159b8e7
F rsrc/icons/Button\sClose-01.png 61e86985ea0820b2b1c77687085a334f80e8683f
F rsrc/icons/Button\sDelete-01.png bd92e3cac0a2de2c9d7423f6f7148484c4082c37
F rsrc/icons/Button\sDownload-01.png d4225280a2dc32202eed8effd5054974f2b88157
F rsrc/icons/Button\sFavorite-01.png 8d2cf9abaf1949070b1a619ccd16ed1edc4ae9d0
F rsrc/icons/Button\sForward-01.png 6e331bfd3a233a40d6fa6fef3a521701ef348efe
F rsrc/icons/Button\sHelp-01.png d039a2098fca2627ad8788c6b32af93ab42844f0
F rsrc/icons/Button\sInfo-01.png be1b3aa44d390070fd2bf4e01283c3eb3965764a
F rsrc/icons/Button\sLog\sOff-01.png 40c91569a169521608f0bb768a553d0376120573
F rsrc/icons/Button\sNext-01.png 964bed76e228f8c9efa11300b691b839478e11a0
F rsrc/icons/Button\sPause-01.png 9c1d5a8fd2a0b609909a3756c173b147c2cc49e5
F rsrc/icons/Button\sPlay-01.png 89bdf23e613c74e57979cb197bfd00e09c1c8a79
F rsrc/icons/Button\sPrevious-01.png 92f7a31def5383ec7a86f0414aa70f54c7f4bce8
F rsrc/icons/Button\sRefresh-01.png 594c33a7ecc20dd13dd0e8717f873357da50cb6c
F rsrc/icons/Button\sReload-01.png 7566acfe8bfa1b022e27010b943e3852d7f33808
F rsrc/icons/Button\sReminder-01.png b6603db497ab7c8c8aef63d999ff5ac5c614610d
F rsrc/icons/Button\sRewind-01.png 6356da09a8b401cc5f7c430b0c529f8702feac52
F rsrc/icons/Button\sTalk\sBalloon-01.png a6f9ffb5f2dd0bd3a41048651a6aacdf53ee1c37
F rsrc/icons/Button\sTurn\sOff-01.png eb741164d55a0d7b5d073a0113abc45ebe0c4b5b
F rsrc/icons/Button\sTurn\sOn-01.png 2856f779e240a99bc5d181b52f358ce92c65700e
F rsrc/icons/Button\sUpload-01.png 942019d20bc3bd7227bd1624d2ffc3d5531963b0
F rsrc/icons/Button\sWarning-01.png bd41b99c1584a86181f5fb8ff213f86334e3d94b
F rsrc/icons/Calculator-01.png a52cc6339c98f3a8f467ce8eb8e60f34eb778f61
F rsrc/icons/Calendar\sBlue-01.png 80f5da756794307a8d354a8bf715d6e687ee920e
F rsrc/icons/Calendar\sGreen-01.png bb242aa1b9e6c997fcc91968143b492516d9d27f
F rsrc/icons/Calendar\sRed-01.png 179b04cc2700660823720d1a7679b33de7b958b8
F rsrc/icons/Clipboard\sPaste-01.png 9d93fc2ce21e7aa4211a0dde9023589b374262e8
F rsrc/icons/Clipboard-01.png bb9c311135d48bd6a3d435f0c5d51ff4c35b6b3c
F rsrc/icons/Clock-01.png 6607d4181689c30e91bfdd16159ecbd742dbdce4
F rsrc/icons/Coin-01.png 36bfdcba641f0ecdb902771b71a18e154777102f
F rsrc/icons/Compressed\sFile\sRAR-01.png c2de3e5ac4547639f9d311b61fca84478531e67c
F rsrc/icons/Compressed\sFile\sSIT-01.png 4adbd6c08e7f4f292abd7298fad6da6d0ff5d3b9
F rsrc/icons/Compressed\sFile\sZip-01.png 3ac05b15cb16df4a2ee6c2320ebd4312ceeb63aa
F rsrc/icons/Computer\sMonitor-01.png f17362f4ec7afd4531eaef6a905a2e25c5b64b63
F rsrc/icons/Computer\sNetwork-01.png fa296534cbc19c9fd5a683a02bb5aa5f85022d08
F rsrc/icons/Document\sAttach-01.png 50bbd2ff79326893f93224c46d0d41f21c675f59
F rsrc/icons/Document\sBlank-01.png c4e260ee3d1461eae0f9b12fe4bf84e6ef710a40
F rsrc/icons/Document\sChart-01.png 3764305ca853077a2fa0dc1e264c2aeebf44d192
F rsrc/icons/Document\sCopy-01.png 2d56e677afb57ab2423bdaaaabc5353369346b61
F rsrc/icons/Document\sFlow\sChart-01.png 4f954822a1a0b5ca0f66c0c48bf18f1fd4fa6b21
F rsrc/icons/Document\sGant\sChart-01.png c94eb569a056bdcc61e1daed4ef8d763b3db1e70
F rsrc/icons/Document\sHelp-01.png 27ac48d35020476070382d68bd1d652ee5996589
F rsrc/icons/Document\sLine\sChart-01.png 47427bbde9d578dbf7a3ce317b5fcad35a5b53b9
F rsrc/icons/Document\sMicrosoft\sExcel-01.png 1961228e739fe2451aa0a3375c8328e5a1038a8a
F rsrc/icons/Document\sMicrosoft\sPowerPoint-01.png f83b4dc5665201b9038690efb4403bcb4281b7bf
F rsrc/icons/Document\sMicrosoft\sWord-01.png 1e994fe798bd71bde553f119ca4d95eb2534992a
F rsrc/icons/Document\sOrganization\sChart-01.png 08e2d90232609a6537ff27c2fcbaf8669d27eef4
F rsrc/icons/Document\sPreview-01.png 6dad0c2b3796f79b9ca2afeda35a4a25b2bf1a93
F rsrc/icons/Document\sText-01.png d2032f213666611e1f2ac3c6d3bbd5ac3cb70c4e
F rsrc/icons/Document-01.png 5caa3fb0c2803a5824967b772e221b8a6bf81888
F rsrc/icons/Document-Revert-icon.png e0b9cdfe17a0f5f56fea52f129adb99e99d3013a
F rsrc/icons/Edit\sDocument-01.png f83318cc0406ec8404162c6fd90bdb87ffd953d2
F rsrc/icons/Email\sAttachment-01.png 9140f252ce29af0f3ca8f8b9438bc5fd73084627
F rsrc/icons/Email\sDelete-01.png 6f7f1f536dcedf8e560a688e10be05c8f292f481
F rsrc/icons/Email\sDownload-01.png b258db6c84afd8d25ad083388715040549fc4f5d
F rsrc/icons/Email\sForward-01.png 2103ff91b3892d31f972ee05c0ae0975bd15630f
F rsrc/icons/Email\sInbox-01.png da93bcba8b4b4e8c809f03c0b0bf836debc26034
F rsrc/icons/Email\sReply-01.png 0d8c08f82ab27fdec23ee9876df08de17c2ceea8
F rsrc/icons/Email-01.png 92d6b1952b23844c162f9641988e1d1d367c6827
F rsrc/icons/File\sAudio\sAIFF-01.png f96b29301442962bf8d0cd9474526213ca91cb0f
F rsrc/icons/File\sAudio\sMP3-01.png ed08e831ac7fa06d307562e0831b1d5279dd0df7
F rsrc/icons/File\sAudio\sWAV-01.png 3c67326fd5ded4dc81792b2439dfc9f9c8c202c9
F rsrc/icons/File\sAudio\sWMA-01.png 90ed8def8fb40f1072087b008a7247dd4c477f5a
F rsrc/icons/File\sAudio-01.png 6b05fba6d25c44345fe7feebc874e3dc0579a980
F rsrc/icons/File\sDelete-01.png e41d9c1bfda748df54f4a60c4bf09e33f01be36e
F rsrc/icons/File\sHistory-01.png e009e86ecf1ab1f79aacd74d69f7c99f7f6a3134
F rsrc/icons/File\sNew-01.png 48347428962e33d2b4b25f4dce85dc892d673aea
F rsrc/icons/File\sOpen-01.png 406b558c24285b5da50604d89c171a8684b9d689
F rsrc/icons/File\sVideo\s3GP-01.png 855490ff7380da71789408e848697e3d0584737a
F rsrc/icons/File\sVideo\sAVI-01.png e307ad10e6761eb2cc47083070bac14288d36381
F rsrc/icons/File\sVideo\sMOV-01.png 8eaa2eabfeaa194aa42d1a3bd6bd0f55b14275ed
F rsrc/icons/File\sVideo\sMPEG-01.png 77bfaf4f0fef4d19a572a34449be609eee146c89
F rsrc/icons/File\sVideo\sWMV-01.png 396d52a2cfbe8ac3c91e67576b7b1d6d25941919
F rsrc/icons/File\sVideo-01.png 8ebed5e9ff46d1532a5df8cd0427918eae2d3565
F rsrc/icons/Folder\sAdd-01.png d069b3c05a9bc41fc58fe5fee85a75dbed2a2f7e
F rsrc/icons/Folder\sCompressed-01.png 8c25f6bc354ac7d48989319627531d94a0e1fd7d
F rsrc/icons/Folder\sDelete-01.png fde9f4c91eade5281999165af04c1b53827fd63c
F rsrc/icons/Folder\sExplorer-01.png 4bca07d4e2a90580ab43fc864826fe9ada299464
F rsrc/icons/Folder\sGeneric\sBlue-01.png 65a1ec6e34725b1ed65e98be169558e3ffbaf95f
F rsrc/icons/Folder\sGeneric\sGreen-01.png 56a1d1084a8de4ebd29be2398b737fdbf956107d
F rsrc/icons/Folder\sGeneric\sRed-01.png 58e9ea810ab2c4b22ac4589ade357beaddd42612
F rsrc/icons/Folder\sGeneric\sSilver-01.png d7c336da6d33cb1b78d4439ca932e5ab0287c976
F rsrc/icons/Folder\sOpen-01.png 8f65da9130e1c4a553d23accc0222a307f209b71
F rsrc/icons/Folder\sRAR-01.png 984bc1348f47d73b59cc66829f14906a4e22d811
F rsrc/icons/Folder-01.png 797254b9c180b17c336eb24510732306454b631b
F rsrc/icons/Games-01.png 36d2c9b086320a67a7bce7ae80bd80b06f660f8b
F rsrc/icons/Gear-01.png dd9d2f1b3eaefd2b376547e8d7dc0224b142fb79
F rsrc/icons/Highlighter\sBlue-01.png f13cd5ab2131e0405e6cca65c9bf859ddeac7dca
F rsrc/icons/Highlighter\sGreen-01.png c27855873f1603692ddec1fe5eb387d82dec4511
F rsrc/icons/Highlighter\sYellow-01.png 50c25fe8857e04ccbe7d518abc8e50cad64e82da
F rsrc/icons/IconCredits.txt e38bd317b7d007b1bffb910f543dbbd376b2b16a
F rsrc/icons/Image\sBMP-01.png 79a0ca5cd1a794b711c37a3ab9a9d45d458c6cd1
F rsrc/icons/Image\sGIF-01.png d409ac6dfeceac46d711cc7bef274d94bbd4e9b0
F rsrc/icons/Image\sJPEG-01.png 63bc765c3c2c389c580faa66c7802f8d18e2ddd7
F rsrc/icons/Image\sPNG-01.png 858fc6a016aa903777fe9e7994b1ebd94d16bd35
F rsrc/icons/Image\sTIFF-01.png c21d860de99f929afe4541f4ac1d8a71c80bff68
F rsrc/icons/Lock\sLock-01.png b1502b0b7ef07d643ae2d169d831a7a6272a02d1
F rsrc/icons/Lock\sUnlock-01.png e47398b3f0ab0f78e04afebb697bd3ab9eff6aa7
F rsrc/icons/My\sDocuments-01.png 4553fc16e9a4b08127f09016469ab5eb00300c8c
F rsrc/icons/My\sEbooks-01.png 0ed4118b3b7fff5d56c8612fb6e0a8e3fd083169
F rsrc/icons/My\sMusic-01.png f7b0dfce2ea321a3b72795fc5501dedf9f5f683c
F rsrc/icons/My\sPictures.png 93728e10f32a81cc965c3390b40abff8cbffbfdc
F rsrc/icons/My\sVideos-01.png 2e8cee013490100dfe4c42c5b2fb10ee3cdee7b0
F rsrc/icons/My\sWebsites-01.png 1af5ae10a10bcc628c60b65bcc82f65537e4b93e
F rsrc/icons/Network\sFirewall-01.png 4bbfe1f6d4b08c900fb5a15ab3ae212ca06ffe88
F rsrc/icons/Network\sMAC-01.png 9001794331edc31f166d9c90be59e49604cc7ee7
F rsrc/icons/Network\sPC-01.png 1d862ce6c21d89cec29e518a290dad785aa17324
F rsrc/icons/Network\sRefresh-01.png 2fd0f18658addfc9f728cb1462fb007e514db9ec
F rsrc/icons/Pen\sBlue-01.png 162d6d34b71697c202e16309962ad8e48fb77ad9
F rsrc/icons/Pen\sGreen-01.png b0ec213414205cc2a443f3113d3c22396fe0556b
F rsrc/icons/Pen\sRed-01.png 6af49c0ee04376c446cdcf0baa404bb724cf2d01
F rsrc/icons/Save-01.png d0b40c336956c9b8dd1ddafe72801c2ff1718ca1
F rsrc/icons/Text\sEdit.png 010ae940be096d9d65d6e53c52fc31d8c238cacc
F rsrc/icons/USB-01.png 2c7e2200c2ddb6e6465dbb167c2b5ee34aaaf5cb
F rsrc/icons/User\sAdministrator\sBlue-01.png e7c742a268bea5242caa41b80a23756b198338a6
F rsrc/icons/User\sAdministrator\sGreen-01.png 86aed5f9bbf259a9aa9d725f033ecd0351c0131e
F rsrc/icons/User\sAdministrator\sRed-01.png d315742668de4b255de1a5ea141bb5e605e9389c
F rsrc/icons/User\sChat-01.png e755eb8d6d476fa92d0155db761819272a0dbf3f
F rsrc/icons/User\sClients-01.png 769b86d73904c0256c7835b0f3dd9e922be4abc4
F rsrc/icons/User\sCoat\sBlue-01.png 2a2a6b9bec6506c55de188a81136c770a0cade72
F rsrc/icons/User\sCoat\sGreen-01.png 61756d020524c1b33c29121188a2b6fe29ab9884
F rsrc/icons/User\sCoat\sRed-01.png 2c63e8b957f56caffa297314e8eae9b646a70440
F rsrc/icons/User\sExecutive\sBlue-01.png f6e5d1c4a4f534f106d1c517cddada9d080a8317
F rsrc/icons/User\sExecutive\sGreen-01.png bd120c95a3b5f03ded7eda8cbd36b0890d830ced
F rsrc/icons/User\sExecutive\sRed-01.png 2a0300a88c070ee20eebd1fef1995ea5bab3297e
F rsrc/icons/User\sGroup-01.png 95efb545e7d01f97ab5c1e1eace5afa0d7d4b31b
F rsrc/icons/User\sPreppy\sBlue-01.png a44530fa2d2a51172f00d78242e2dd922408bdf5
F rsrc/icons/User\sPreppy\sGreen-01.png b814dcaf10f54adb0557d1dd8dc8c09abf1ed0e5
F rsrc/icons/User\sPreppy\sRed-01.png b28eaef39fdff249fb4bf5e49ad4c584a3845ed5
F rsrc/icons/Web\sHTML-01.png 6232d980a5ad2b3a313475abda43659ab400bb69
F rsrc/icons/Web\sXML-01.png 0f5cd39709e7b99a1e6833b6718c631756ce8f7c
F rsrc/icons/Window\sRefresh-01.png 14740f1fbc0bf6fe43e571bf344f1354c3b55f82
F rsrc/icons/Window-01.png c283536f3825409ce01c0446a528b9a0c3cee203
F rsrc/icons/Windows\sCascade-01.png 4d61073295f73437d2c01c4829da94b29823fa7e
F rsrc/icons/Windows-01.png c5da37a9fb6e9c777107668b39fec98169a1db77
F rsrc/icons/Zoom\sIn-01.png bdd24558fd23a1003f1a569f092f22022736f236
F rsrc/icons/Zoom\sOut-01.png 8eda092100d9e00c9097f43a80d1e26695947448
F rsrc/icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6
F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
F rsrc/resources.qrc 227b1a42d7ee792386392872d747a176b508992c
F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
F src/CloneDialog.cpp 812ef7d361c16da21540b7047c9d4d5e74f18539
F src/CloneDialog.h e9f0fc8e5cc5ea2e7c43d6e77b5c4a9cc850b59e
F src/CommitDialog.cpp 5300522ac11bc1096a11a6ce22f8c1665d4afc05
F src/CommitDialog.h f1ee8db92103164e7db55a8407ccdcff24571b72
F src/CustomWebView.cpp b7dd0c41977c2cba005df07ed8967ba6f58d07d9
F src/CustomWebView.h fbc8ee55812d1acb3c3b2bc31be7533e8a112822
F src/FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp f321f9e0b9aa3f55966f3c19fb3d3c3488676fe1
F src/MainWindow.h dc0a9ed7de8a338e56c38c00ec303796f31bd24d
F src/SettingsDialog.cpp 515166bcaedf16432208bf8ef6bffec1529b1198
F src/SettingsDialog.h 01c1f876c64f750ba8820a0d745e377acabe4921
F src/Utils.cpp 9aff456712e4276b49083426301b3b96d3819c77
F src/Utils.h c546e478a1225a28c99cd4c30f70cf9be9804a2a
F src/main.cpp 99a9d7e0634f4ea54259542cacfbb9d1e76ccb75
F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad
F ui/SettingsDialog.ui 55aefad7145c40d936c43759789d1b50e361b020
P 872751fabaa47ac1f1f9d4caa4bdb42ae2e371cd
R c0ce9739ba0809720ddd275ca5e66571
U Kostas
Z 0f01ed065c4316a05b26b5aa37511ad2
Reference in New Issue View Git Blame Copy Permalink