Age | Commit message (Collapse) | Author |
|
Conflicts (manually resolved: merge old and new parts):
.gitmodules
|
|
|
|
Conflicts: (manually resolved)
.gitignore
Makefile
|
|
multi-layered Gits).
|
|
Conflicts (manually resolved):
.gitignore
ikiwiki.setup
ikiwiki_da.setup
ikiwiki_nb.setup
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
Conflicts (manually resolved):
Makefile
|
|
visible breakage).
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
ikiwiki_da.setup
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
|
|
|
|
|
|
|
|
on osx fails with Makefile:128: *** missing endif. Stop.
|
|
|
|
|
|
|
|
|
|
|
|
only relevant for (not yet implemented) automated tests.
|