diff options
| author | h-v-smacker <hans-von-smacker+github@gmail.com> | 2018-01-21 22:49:36 +0300 |
|---|---|---|
| committer | h-v-smacker <hans-von-smacker+github@gmail.com> | 2018-01-21 22:49:36 +0300 |
| commit | ffca704cc2b258e58a2a10079d9c49a2c20fe0fe (patch) | |
| tree | 5df2ea2d5f5b302c517d790f70138455a6386b10 /depends.txt | |
| parent | 787f52467c40401c2d3a23f8b46b793eded63043 (diff) | |
| parent | 7a1029a38a89574ad4979a71597fb6fd4fefc4b1 (diff) | |
merging with revamped upstream
Diffstat (limited to 'depends.txt')
| -rw-r--r-- | depends.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/depends.txt b/depends.txt index 6efe685..af2d4c5 100644 --- a/depends.txt +++ b/depends.txt @@ -1,4 +1,8 @@ default intllib? lucky_block? -pipeworks?
\ No newline at end of file +<<<<<<< HEAD +pipeworks? +======= +pipeworks? +>>>>>>> upstream/master |