Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts (manually resolve):
Makefile
basewiki
ikiwiki_nb.setup
templates
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Makefile (manually resolved)
|
|
Conflicts:
Makefile (manually resolved)
|
|
|
|
multi-layered Gits).
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_da.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
on osx fails with Makefile:128: *** missing endif. Stop.
|
|
|
|
|
|
|
|
|
|
|
|
only relevant for (not yet implemented) automated tests.
|
|
|
|
|
|
|
|
them explicitly in Makefile.
|
|
headlines, blockquotes, triple-quotes or html tags.
|
|
|
|
MASTER_L10NFILES in Makefile.
|
|
resolving *_L10NFILES in Makefile.
|
|
translations in Makefile.
|
|
ALL_MASTEFILES) in Makefile.
|
|
|
|
|
|
|