diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-30 19:12:56 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-30 19:12:56 +0100 |
| commit | 78737b78ac45d1213395819f3b85b4226088bd1a (patch) | |
| tree | ad87d71fab0d9963bcb944666dc4ac7873569ec0 /.file-metadata | |
| parent | b0993336112b244ea7e919d96ffdbaf167831b9d (diff) | |
| parent | 743637f54b99310defc2cc5bdbc1bbd8d3e09e0f (diff) | |
Imported some recent/parallel work, conflicts fixed
Especially because of the new convention regarding backslashes, there were
many conflicts that are now fixed. But none were substantial.
Diffstat (limited to '.file-metadata')
| -rw-r--r-- | .file-metadata | bin | 6713 -> 6713 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex a86e94c..c22144e 100644 --- a/.file-metadata +++ b/.file-metadata |