Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved: merge old and new parts):
.gitmodules
|
|
|
|
|
|
Conflicts:
Makefile (manually resolved)
|
|
|
|
multi-layered Gits).
|
|
Conflicts (manually resolved):
ikiwiki_da_admin.setup
|
|
Conflicts (manually resolved):
ikiwiki_da.setup
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
on osx fails with Makefile:128: *** missing endif. Stop.
|
|
|
|
|
|
|
|
|
|
|