summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-07-21Merge branch 'wian' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): templates
2010-07-21Sync submodules templates(_nonedit) with HEAD of allinone(-nonedit)-da.Jonas Smedegaard
2010-07-20Sync submodule templates with HEAD of wian.Jonas Smedegaard
2010-07-19Sync submodule directives with HEAD of master.Jonas Smedegaard
2010-07-19Merge branch 'wian' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): basewiki
2010-07-19Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2010-07-19Merge branch '_scs' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): basewiki templates
2010-07-19Merge branch '_clean' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): basewiki
2010-07-19Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (changes suppressed): basewiki smiley templates
2010-07-19Fix revert submodules basewiki and templates to sync with HEAD of master ↵Jonas Smedegaard
(not scs: switch later).
2010-07-19Fix revert submodules basewiki, javascript, openid-selector, smiley and ↵Jonas Smedegaard
templates to sync with HEAD of master (not master-nb: switch later).
2010-07-19Fix revert submodules basewiki and templates to sync with HEAD of master ↵Jonas Smedegaard
(not clean switch later).
2010-07-19Merge branch 'master' into allinone-nbJonas Smedegaard
Conflicts (changes suppressed): basewiki templates
2010-07-19Merge branch 'master' into _nbJonas Smedegaard
Conflicts (override with HEAD of submodules): basewiki templates
2010-07-19Merge branch 'master' into wianJonas Smedegaard
Conflicts: basewiki templates
2010-07-19Merge branch 'master' into noneditnoneditJonas Smedegaard
2010-07-19Merge branch 'master' into _scsJonas Smedegaard
Conflicts (suppressed): basewiki templates
2010-07-19Merge branch 'master' into _cleanJonas Smedegaard
Conflicts (suppressed): basewiki
2010-07-19Sync submodules basewiki directives and templates.Jonas Smedegaard
2010-07-19Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki
2010-07-19Merge branch '_scs' into allinone-nbJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki
2010-07-19Merge branch '_clean' into allinone-nbJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki
2010-07-19Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (sync submodules basewiki, basewiki_nonedit and templates_nonedit with HEAD of *_nb branch): basewiki
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodules basewiki, javascript and openid-selector.Jonas Smedegaard
2010-07-19Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-07-19Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2010-07-19Merge branch '_scs' into allinone-nbJonas Smedegaard
2010-07-19Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-07-19Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-07-19Merge branch 'master' into allinone-nbJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'master' into wianJonas Smedegaard
2010-07-19Merge branch 'master' into _nbJonas Smedegaard
2010-07-19Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'master' into _scsJonas Smedegaard
2010-07-19Merge branch 'master' into _cleanJonas Smedegaard
2010-07-19Improve grammar (OpenID is common gender, not neuter; wikipedia link on url) ↵Jonas Smedegaard
in danish po of basewiki and templates.
2010-07-18Improve grammar in danish po of basewiki and templates: ↵Jonas Smedegaard
signin=registrér/notér (not log på).
2010-07-18Fix a grammar error in danish po of templates.Jonas Smedegaard
2010-07-18Refresh (i.e. drop po line-wrapping of) danish po of templates.Jonas Smedegaard
2010-07-18Fix a couple of grammar errors in danish po of templates.Jonas Smedegaard
2010-07-17Update danish PO of smiley.Jonas Smedegaard
2010-07-17Update danish PO of templates.Jonas Smedegaard
2010-07-16Update danish PO of basewiki.Jonas Smedegaard
2010-07-16Sync with (CVS snapshot of) po4a 0.39.1.Jonas Smedegaard
2010-07-16Bump Project-Id-Version for PO templates.Jonas Smedegaard
2010-07-16Bump ikiwiki_VERSION in Makefile.Jonas Smedegaard
2010-07-15Add javascript openid-selector and themes as submodules.Jonas Smedegaard
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-05 02:13:40 +0000