curt
/
osync
mirror of https://github.com/deajan/osync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,661 Commits
5 Branches
26 Tags
6.1 MiB
Commit Graph

1138 Commits (7d8978dc883c5e0749a06738136e481d3899ce31)

Author SHA1 Message Date
deajan 2aa36b626a Replaced Logger with RemoteLogger in triggerUpdate 2018-10-10 02:09:46 +02:00
deajan f0336c0dec Added target-helper syncdir checks 2018-10-10 01:57:20 +02:00
deajan 3dc8478ba7 Added default MIN_WAIT and MAX_WAIT values 2018-10-10 01:45:39 +02:00
deajan 633e6397d0 Fixed missing equal sign for password-file 2018-10-10 01:40:26 +02:00
deajan babeea9d9a Fixed unlocking 2018-10-10 01:33:31 +02:00
deajan 9cb6cc57af Fixed typos 2018-10-10 01:31:12 +02:00
deajan 7eb4ee68ae Added unlockReplica pid initialisation 2018-10-10 00:05:46 +02:00
deajan 660e856986 Unlocking only when locks exist 2018-10-10 00:04:30 +02:00
deajan ac31de2388 Cleanup also called when bogus config detected 2018-10-09 23:57:53 +02:00
deajan ae64a967f6 Continuing isolating ConflictLog detection issue 2018-10-08 22:40:41 +02:00
deajan 2ca8803b3a No need for paranoia debug in CleanUp for remote exec 2018-10-08 21:53:30 +02:00
deajan ad9d978fc2 Typo fixing 2018-10-08 21:50:35 +02:00
deajan 7570794632 Improved remote execution results 2018-10-08 21:40:57 +02:00
deajan 4651ff0e06 Added remote detection 2018-10-08 21:34:41 +02:00
deajan 0e2189c441 Added RUN_DIR subset 2018-10-08 21:29:47 +02:00
deajan 1ab6042a62 Fixed typo in _getFileCtimeMtimeRemote 2018-10-08 21:17:36 +02:00
deajan a5f5b3a800 Rebuilt targets 2018-10-08 20:12:59 +02:00
deajan b95474a8e6 Updated expr to not use extended regular expressions 2018-10-08 20:11:39 +02:00
deajan e3855c4256 Revert work on _getCtimeMtimeFileRemote error detection 2018-10-07 17:51:15 +02:00
deajan 51f6dcbd71 Trying to identify concurrency issue with ConflictDetection 2018-10-07 17:50:37 +02:00
deajan 3d68a135a4 Conflict detection random bug isolation 2018-10-07 14:43:31 +02:00
deajan 9e17e114f7 Rebuilt targets 2018-10-07 14:42:41 +02:00
deajan 94a71620a1 Made ctime.mtime functions more clear in syntax 2018-10-07 13:23:45 +02:00
deajan bad7767809 Harmonize ExecTasks calls 2018-10-07 12:59:56 +02:00
deajan fa5cf2de57 Another set of conflictLog issue isolation 2018-10-07 12:25:53 +02:00
deajan 9eb29c3454 Rebuilt targets 2018-10-07 12:25:27 +02:00
deajan 4129dfff37 Typo fix 2018-10-07 12:25:07 +02:00
deajan c452bd45e6 Increased TSTAMP randomization 2018-10-07 12:24:35 +02:00
deajan 6b0bab0984 Removed unused variable 2018-10-07 12:23:59 +02:00
deajan 89d63d83b8 Removed unused variable 2018-10-06 22:16:11 +02:00
deajan e0f177f5c2 Added comment about unit file verification 2018-10-06 21:57:11 +02:00
deajan 6bd5862702 Removed unused argument from conflictList 2018-10-06 21:41:58 +02:00
deajan eb8c780d84 Rebuilt targets 2018-10-06 20:03:58 +02:00
deajan 58e5c654d3 Isolate conflict detect bug 2018-10-05 00:51:20 +02:00
deajan e411c81f3d Removed double debug logs 2018-10-05 00:46:11 +02:00
deajan 57647b8960 Isolate ConflictDetection function 2018-10-05 00:39:48 +02:00
deajan 5b395b3c04 Travis debug can fail 2018-10-02 23:37:33 +02:00
deajan 4bd4bbc247 Reverted travis debug lines 2018-10-02 23:26:04 +02:00
deajan 4de784d90f Added default umask 2018-10-02 23:20:26 +02:00
deajan 6c1b7a541b Fixed bogous CreateDir rights 2018-10-02 23:06:33 +02:00
deajan 6e7b99debb IsInteger should be part of ofunctions micro/mini 2018-10-02 23:00:54 +02:00
deajan 996e6251e1 Added missing IsInteger function 2018-10-02 22:43:24 +02:00
deajan a265ca4eef Travis here and travis there 2018-10-02 22:38:57 +02:00
deajan 306d5ff1ad Added permissions on CreateDir 2018-10-02 22:36:30 +02:00
deajan 74271d220c I f*cking hate travis 2018-10-02 21:27:12 +02:00
deajan 8a350333a8 Travis debug... 2018-10-02 19:32:21 +02:00
deajan e9daf2b2bf Removed unused code 2018-10-02 19:30:36 +02:00
deajan d58071c898 Why is travis so bad... 2018-10-02 19:29:15 +02:00
deajan b07ee4a645 Fixed installer directive 2018-10-02 19:26:57 +02:00
deajan 9537b92bf6 Rebuilt targets 2018-10-02 19:02:31 +02:00
deajan 2c857a1e83 Fixed removing directories on soft deletion 2018-10-02 19:01:44 +02:00
deajan 6f2e1af3d7 Added release policy 2018-10-02 18:24:40 +02:00
deajan 0b7b6808d5 Add shellcheck exclusions 2018-10-02 18:22:36 +02:00
deajan 7eab6df734 Better log message 2018-10-02 18:19:32 +02:00
deajan bc6ebdb80e Fixed merge paths and removed unused code 2018-10-02 18:13:48 +02:00
deajan 0d6f7e0ca0 Merge cleanup 2018-10-02 18:11:01 +02:00
deajan 49948dd637 Fixed installer 2018-10-02 18:09:21 +02:00
deajan f35d5841c2 Added cleanup routine 2018-10-02 18:09:12 +02:00
deajan 81148db1fa Fixed merge producing rogue logs 2018-10-02 18:08:03 +02:00
deajan 250ac48ed6 Indentation fix 2018-10-02 11:41:46 +02:00
deajan 65d4c3c3ff Random generator improvements 2018-10-02 11:37:46 +02:00
deajan bbfa4c9d3b Rebuilt targets 2018-10-02 10:52:25 +02:00
deajan 25070032c4 Typo fix 2018-10-02 10:51:45 +02:00
deajan 4f76bb4ad2 Simpler merge process 2018-10-02 10:49:28 +02:00
deajan 465a3b9b80 IsNumeric and IsNumericExpand are now busybox compatible 2018-10-02 10:49:16 +02:00
deajan a9434e605b Removed unused dummy function 2018-10-02 10:09:40 +02:00
deajan 06004ac05d Function reorganisation 2018-10-02 10:07:01 +02:00
deajan b2463d2e08 Added includes to batcher 2018-10-02 09:37:25 +02:00
deajan 13286c2720 [WIP] Merge simplifications 2018-10-02 09:35:48 +02:00
deajan a734dadfde Don't dev at night kids... 2018-10-02 09:24:15 +02:00
deajan c694580ae5 Yet another typo fix 2018-10-02 09:22:41 +02:00
deajan 4f3e6a11d2 Fixed typo 2018-10-02 09:17:59 +02:00
deajan f028f3b6d2 Added preprocessing to batch runner 2018-10-02 09:07:19 +02:00
deajan 2e6e17962c Removed space 2018-10-01 21:04:41 +02:00
deajan 52cf42a53c Add TSTAMP and SCRIPT_PID variables 2018-10-01 21:03:00 +02:00
deajan 5bc77dfe76 Add PoorMansRandomGenerator subset 2018-10-01 21:02:47 +02:00
deajan 1869b1e82f Added Trapquit to trigger CleanUp 2018-10-01 20:49:53 +02:00
deajan 3532b50c38 Added CleanUp subset 2018-10-01 20:46:55 +02:00
deajan d0b40257fa Added cleanup function to installer 2018-10-01 20:46:21 +02:00
deajan 59b7562a3e Fixed Logger missing RUN_DIR 2018-10-01 20:43:27 +02:00
deajan c99a1293c7 Debug conflictLog in travis 2018-10-01 20:28:46 +02:00
deajan eb609f7faa Some release details 2018-10-01 20:13:58 +02:00
deajan 7e678b6480 Debug output for travis conflictDetect tests 2018-10-01 20:01:26 +02:00
deajan b4cd0834cd Fixed shellcheck SC2027 in RsyncPatterns 2018-10-01 14:13:05 +02:00
deajan 55534e0669 Fixed shellcheck SC2053 in Vercomp 2018-10-01 14:10:16 +02:00
deajan 2eba91a58f Removed unused variables 2018-10-01 14:09:20 +02:00
deajan 01864e4980 Rebuilt targets 2018-10-01 14:03:09 +02:00
deajan 87cdc8eb98 Removed extra output from PoorMansRandomGenerator 2018-10-01 14:02:44 +02:00
deajan 740d5277cc Rebuilt targets 2018-10-01 11:31:22 +02:00
deajan a230d32042 Improve PoorMansRandomGenerator function 2018-10-01 11:27:01 +02:00
deajan dde31090fe Improved inotifywait call 2018-10-01 10:49:35 +02:00
deajan 88597d6a7a Initial target-helper mode working 2018-10-01 10:27:01 +02:00
deajan 6bce2e1755 [WIP] Less restrictive preflight checks in target-helper mode 2018-10-01 10:08:22 +02:00
deajan fe808ca909 [WIP] target_helper switch should not be a half bool half char 2018-10-01 10:01:00 +02:00
deajan 90a09c422b [WIP] Use same variable names in target-helper mode 2018-10-01 09:57:27 +02:00
deajan 47bb01b0dc [WIP] Pass initiator ssh uri on target-helper mode 2018-10-01 09:54:24 +02:00
deajan f50048180a Rebuilt targets 2018-10-01 07:27:20 +02:00
deajan 5945988e96 Fix wrong log message on MacOS 2018-10-01 07:26:56 +02:00
deajan 07775d7390 [WIP] osync-target-helper mode 2018-09-30 21:24:09 +02:00
deajan af7542d8f5 [WIP] target helpder service in osync 2018-09-30 16:08:12 +02:00
deajan b44c0c13ad Rebuilt targets 2018-09-30 14:50:51 +02:00
deajan d727bc353c Fixed rsync args built logic 2018-09-30 14:50:00 +02:00
deajan 3af0bc7a11 Rebuilt targets 2018-09-30 14:07:09 +02:00
deajan f1e40d54e4 Fixed typo 2018-09-30 14:06:24 +02:00
deajan 76f9f31e6d Moved RSYNC_ARGS to RSYNC_DEFAULT_ARGS 2018-09-30 13:57:57 +02:00
deajan 50496070f6 Merge branch 'master' of https://github.com/deajan/osync 2018-08-08 11:45:08 +02:00
deajan 1eec242cb0 Rebuilt targets 2018-08-08 11:31:58 +02:00
deajan 4cf697cd28 Bump osync version 2018-08-08 11:31:11 +02:00
deajan 23a9f357fe Bump ofunctions version 2018-08-08 11:30:45 +02:00
Orsiris de Jong 7c11240034
Change logger date output to be language agnostic 2018-07-14 15:37:14 +02:00
deajan 6222fd6872 Fixed variable leak 2018-07-09 15:01:45 +02:00
deajan cabd90c570 Fixed error log color not working in busybox #151 2018-07-09 15:00:38 +02:00
deajan 3f46c69c6d Removed redundant partial exclude dir from daemon 2018-07-08 13:19:30 +02:00
deajan 24599c3057 Fix for #119 2018-07-08 13:18:26 +02:00
deajan fa64c49244 Added EscapeDoubleQuotes function 2018-07-03 17:29:51 +02:00
deajan cf609998aa Updated shunit test framework 2018-07-02 23:25:49 +02:00
deajan 82e60bdffe Tidyup 2018-07-02 22:40:55 +02:00
deajan 83321db4ea WIP on conflict detection 2018-07-02 22:40:23 +02:00
deajan 76ed396602 More comment fixes 2018-07-02 22:21:36 +02:00
deajan f3215c0474 Quick typo fix 2018-07-02 22:17:17 +02:00
deajan 7cb987a32b More email checks 2018-07-02 22:09:28 +02:00
deajan f79acad239 Fixed conflictLsit output and typos 2018-07-02 22:09:18 +02:00
deajan 548c766920 Fixed conflict list initialization 2018-07-02 18:19:47 +02:00
deajan 9b3af0596e Comment tidyup 2018-07-02 17:29:50 +02:00
deajan b45e50584f Comment tidyup 2018-07-02 17:29:18 +02:00
deajan 1ea4584027 Fix typo 2018-07-02 15:46:45 +02:00
deajan 61f7ebe156 WIP: no conflictDetection tests while working on it 2018-07-02 15:44:27 +02:00
deajan 41144f5705 Fixed fakeroot for ssh_filter 2018-07-02 15:41:30 +02:00
deajan 5438941c88 Help..travis is killing me 2018-07-02 15:37:35 +02:00
deajan 888309f420 Well... change FAKEROOT from /tmp to /home 2018-07-02 15:34:53 +02:00
deajan 704d3d20a7 Travis... travis...travis... 2018-07-02 15:33:49 +02:00
deajan 503e325e14 Comment reorganization 2018-07-02 15:32:48 +02:00
deajan 182e3921d5 Why do you do this travis ? 2018-07-02 15:23:44 +02:00
deajan e094e04038 Travis sudo to create a tmp file... 2018-07-02 15:15:39 +02:00
deajan a2a6d843b9 More travis tests 2018-07-02 15:12:02 +02:00
deajan 7ddd13f122 Trying various travis fixes 2018-07-02 14:44:16 +02:00
deajan f0f3cd64b1 Added email encoding comment 2018-07-02 10:42:32 +02:00
deajan 9cac01d9fd Unexpanded and removed work comments 2018-07-02 10:40:10 +02:00
deajan c04e0fa21a Some comment love 2018-07-02 10:20:34 +02:00
deajan 9e869e2bc4 Fix travis won't allow file creating in /tmp/osync_test_install 2018-07-02 10:12:16 +02:00
deajan 948a2b2f87 Log messages improvements for travis 2018-07-02 10:07:48 +02:00
deajan c3b468d932 Travis related test 2018-07-02 10:00:38 +02:00
deajan 2f5e21caea Fixed typo 2018-07-02 09:58:25 +02:00
deajan 0a8811cfb9 Temporarily disabled conflictList test 2018-07-01 10:55:07 +02:00
deajan 4d322f7e6b WIP: initialization should take create conflict list possibility 2018-07-01 10:54:17 +02:00
deajan 9b4914c49e cmdline arg improvements 2018-07-01 10:46:16 +02:00
deajan 21bc4e1ee7 WIP: conflict detection and fakeroot install 2018-06-30 19:46:11 +02:00
deajan 3d6eaef447 Bumped version to 1.3-dev 2018-06-30 19:40:24 +02:00
deajan 381313dc41 Fixed typo 2018-06-29 22:11:33 +02:00
deajan b3cccc373a Quick OS detection fix 2018-06-26 09:56:54 +02:00
deajan 42ed3b156a Rebuilt targets 2018-06-26 00:23:01 +02:00
deajan de57e37217 Added OpenRC support 2018-06-26 00:21:00 +02:00
deajan bf54ce8693 Finished WIP on --summary for deletions 2018-06-25 23:59:06 +02:00
deajan 7621f3ec25 Implemented --initialize 2018-06-25 23:55:13 +02:00
deajan ad22361ee5 Updated os detection 2018-06-25 15:10:11 +02:00
deajan 494fcda098 Fixed BASHVERBOSE variable 2018-06-25 14:49:15 +02:00
deajan bd2e5a16c6 Replaced QuickLogger with Logger for #148 2018-06-25 14:12:05 +02:00
deajan 844cf56307 Replaced QuickLogger with Logger 2018-06-25 14:11:46 +02:00
deajan 8dfe59220a Removed quicklogger function 2018-06-25 14:11:29 +02:00
deajan c39544d79c Removed finished working comments 2018-06-25 11:18:53 +02:00
deajan 0ccc737631 Conflict log line only appears if used 2018-06-25 11:16:57 +02:00
deajan d9f749e28a Less verbose ExecTasks logging 2018-06-24 19:10:35 +02:00
deajan 1ed49b7d41 Quick note about file updates 2018-06-24 19:10:23 +02:00
deajan 166a37865e UrlEncode function now works with busybox 2018-06-05 11:51:49 +02:00
deajan dc31bfb42d Fixed rundir timestamp filename bug on busybox 2018-06-04 14:13:10 +02:00
deajan 4d9eb8830b Fixed missing usage 2018-05-28 08:28:01 +02:00
deajan 1314a3381b Updated osync test file URL 2018-05-18 12:29:39 +02:00
deajan 6d37e161c8 Merge branch 'master' of https://github.com/deajan/osync 2018-03-22 17:24:36 +01:00
deajan f627daf25a bootstrap can now use BASH_VERBOSE=yes 2018-03-22 17:24:04 +01:00
deajan ee8016ef9a Rebuilt targets 2018-03-22 17:23:48 +01:00
deajan 1b33068422 Fixed #135 2018-03-22 17:23:14 +01:00
Hugo Rivera 3c1c606de4 Set `MAX_EXEC_TIME_PER_CMD_*` variables without config file 2018-03-20 03:58:21 -06:00
Hugo Rivera 4725370d8e Set `MIN_WAIT` without config file 2018-03-20 03:58:10 -06:00
deajan 041de62c36 Rebuilt targets 2018-03-15 09:57:04 +01:00
deajan e8436e46bd Fixed typo for function name 2018-03-15 09:54:12 +01:00
deajan 36daadd7aa Ported fixes from obackup 2018-03-15 09:53:35 +01:00
deajan dee5b4037c Minor improvements to ExecTasksé 2018-02-24 16:34:53 +01:00
deajan d13b76087f Rebuilt targets 2018-02-20 22:54:07 +01:00
deajan 46a990c4d8 Fixed inotifywait cannot load loop 2018-02-20 22:53:30 +01:00
deajan d8b30d7711 Added sed regex compat for MacOS 2018-02-20 22:39:42 +01:00
deajan 190e46c785 Added sex regex compat for MacOS 2018-02-20 22:37:46 +01:00
deajan da381175ed Addec CheckRFC822 subset 2018-02-20 22:15:20 +01:00
deajan 034c1693e9 Updated ExecTasks version 2018-02-20 22:15:04 +01:00
deajan 686a28cf08 Merged improvements from burp branch 2018-02-20 22:14:41 +01:00
deajan 57cf91e4c6 Added better failed remote connection log 2018-01-31 21:04:48 +01:00
deajan df9a90896a Rebuilt targets 2018-01-03 17:41:06 +01:00
deajan 328a07e406 More ExecTasks fixes 2018-01-03 17:40:29 +01:00
deajan ebf8b106d5 Fixed ExecTasks parallelExec runs 2018-01-03 15:11:16 +01:00
deajan 9a0dba00e4 Rebuilt targets 2018-01-02 20:06:31 +01:00
deajan 9b8fe3774e Fixed time counting for new ExecTasks 2018-01-02 20:05:54 +01:00
deajan 73d592ad34 Merged WaitForTaskCompletion and ParallelExec into ExecTasks 2018-01-02 20:02:57 +01:00
deajan cbd7607836 Rebuilt targets 2017-12-30 17:59:48 +01:00
deajan 8fb3ea2532 Added fix from PR #123 2017-12-30 17:59:12 +01:00
deajan 1b079ebee5 Rebuilt targets 2017-12-30 17:56:03 +01:00
deajan 755edb0654 Fixed #116 in master too 2017-12-30 17:55:27 +01:00
deajan c78d6bc4ce Fixed process counting message 2017-12-02 13:16:48 +01:00
deajan 7e26863daf Backports from other projects 2017-12-02 12:45:00 +01:00
deajan 7d22be8375 Rebuilt targets 2017-11-23 16:58:49 +01:00
deajan 0a1dc91fad Fixed bogus global WAIT_FOR variable 2017-11-23 16:58:29 +01:00
deajan c05499c5f2 Improved ParallelExec status message 2017-11-23 00:38:12 +01:00
deajan a65bec4410 Replaced IsNumeric with IsInteger for pid checks 2017-11-23 00:30:47 +01:00
deajan a5618c80d8 Rebuilt targets 2017-11-22 15:05:26 +01:00
deajan 6d217c1e15 Reintroduced fix from #120 2017-11-22 15:05:09 +01:00
deajan 9833ce9032 Rebuilt targets 2017-11-22 15:02:36 +01:00
deajan 71a0437de6 Ensured writeLocks=false at beginning of lock handling 2017-11-22 15:02:17 +01:00
deajan 972b8481f1 Rebuilt targets 2017-08-14 22:22:28 +02:00
deajan 86930737b0 Added -f to local replica unlock 2017-08-14 22:21:41 +02:00
deajan 86ff4dc5e9 Rebuilt targets 2017-07-27 23:20:24 +02:00
deajan 168fc7b2f5 Updated usage 2017-07-27 23:16:51 +02:00
deajan 7cbbdb960a Installer adds --prefix option + fixes 2017-07-27 23:15:35 +02:00
deajan 09c664fe4b Moved commandline args setup to sub function 2017-07-27 22:50:48 +02:00
deajan a80b65860a Quick preflight check for bootstrap 2017-06-20 15:20:42 +02:00
deajan 1375ab425b Initial upload of target helper service 2017-06-19 16:08:17 +02:00
deajan 29dc7a3e9e Merge now requires program name 2017-06-19 16:01:47 +02:00
deajan 2038a2ecb9 Made bootstrap and merge program agnostic 2017-06-19 16:01:16 +02:00
deajan e07cb136c4 Permit merge of other executables 2017-06-18 22:53:57 +02:00
deajan 5bcc7c75ea Permit bootstrap of other executables 2017-06-18 22:48:38 +02:00
deajan 8d9a6be16a Typo fixing 2017-06-18 22:11:09 +02:00
deajan 06becc5181 Updated ofunctions 2017-06-09 11:49:13 +02:00
deajan 1dc9408044 Fix double compression extension 2017-06-09 09:56:11 +02:00
deajan 9676ccccad Removed work comments 2017-06-09 08:34:48 +02:00
deajan 45e4419a0f Fixed typo 2017-06-09 08:33:57 +02:00
deajan 9b9631fe2c Changed sed -E to sed -r for compat issues 2017-06-08 16:30:20 +02:00
deajan 5c36e803d8 Revert "More sort enforcing" 
This reverts commit fbb36b51b7.
 2017-06-08 15:39:57 +02:00
deajan fbb36b51b7 More sort enforcing 2017-06-08 15:20:36 +02:00
deajan 9220cecebc Rebuilt targets 2017-06-08 14:43:17 +02:00
deajan a7f9a28c93 Merge branch 'master' of https://github.com/deajan/osync 2017-06-08 14:42:12 +02:00
deajan 1f6fe47c2c Rebuilt targets 2017-06-08 14:41:59 +02:00
deajan 4678ab7e71 Fixed missing env for LC_ALL 2017-06-08 09:25:33 +02:00
deajan 261521d047 Added LC_ALL to all ssh calls 2017-06-07 12:48:52 +02:00
deajan 10ebfaae16 Added LC_ALL=C to all ssh calls 2017-06-07 12:43:56 +02:00
deajan 30c6b3ec46 timestampList is not used for ACL lists yet 2017-06-07 12:17:39 +02:00
deajan 543cfc1159 Fixing sort order in conflictList 2017-06-06 17:39:53 +02:00
deajan 679e140084 Fix new regex in treelist for rsync output 2017-06-06 16:47:32 +02:00
deajan 3e9a380b6b Updated config to v1.2.2-dev 2017-06-06 16:21:56 +02:00
deajan 84a108dd41 Rebuilt targets 2017-06-05 18:59:44 +02:00
deajan d0d7be40c3 Added --dry support for conflict list 2017-06-05 18:59:05 +02:00
deajan 7a24cf49cd Implemented --alert-conflicts options 2017-06-05 18:53:15 +02:00
deajan be3b3d39b6 Added error handling to conflict list functions 2017-06-05 15:32:38 +02:00
deajan 11408d2de0 Add more locale exports 2017-06-05 15:03:01 +02:00
deajan 7260d43416 Improved conflict list work 2017-06-04 19:07:22 +02:00
deajan 1d7cb5be53 Multiple file list fixes 2017-06-04 13:01:34 +02:00
deajan b4f1bd37ea Rebuilt targets 2017-06-03 13:58:33 +02:00
deajan 2b786abc6a Some comment removal 2017-06-03 13:57:10 +02:00
deajan bd6b1a60e8 Rebuilt targets 2017-06-03 13:52:12 +02:00
deajan 967ce33977 WIP: conflict list 2017-06-03 13:51:49 +02:00
deajan 37ca73a6f9 moved unfortunate comment placement 2017-06-03 01:28:34 +02:00
deajan 9e1c3c2a65 WIP: conflict list 2017-06-03 01:20:38 +02:00
deajan 862a6fd235 Fixed some more typo 2017-06-02 15:42:45 +02:00
deajan 83fd33bf78 WIP: conflict list 2017-06-01 17:45:02 +02:00