-
Vitaly Lipatov authored
The -s ours strategy discarded the merged tag content, so packages with vendored sources were not actually merged into master. Use a regular merge for all packages. Reverts d223e6ca.
bd83b595
| Name |
Last commit
|
Last update |
|---|---|---|
| .gear | ||
| bin | ||
| etc | ||
| po | ||
| share/eterbuild | ||
| tests | ||
| tools | ||
| .gitignore | ||
| AUTHORS | ||
| LICENSE | ||
| Makefile | ||
| NEWS | ||
| QuickHelp.txt | ||
| QuickHelp.utf8.txt | ||
| README.md | ||
| README.ru.md | ||
| TODO | ||
| check_et.log | ||
| check_reqs.sh | ||
| etersoft-build-utils.spec |