Homec4science

Merge branch 'maint-1.0' into maint-1.1

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 25 2014, 11:40.

Description

Merge branch 'maint-1.0' into maint-1.1

  • maint-1.0: Invenio v1.0.6 I18N: PO file update for the release of v1.0.6 Invenio v0.99.9 I18N: PO file update for the release of v0.99.9

Conflicts:
AUTHORS
INSTALL
Makefile.am
NEWS
RELEASE-NOTES
po/af.po
po/bg.po
po/ca.po
po/cs.po
po/de.po
po/el.po
po/en.po
po/es.po
po/fr.po
po/gl.po
po/hr.po
po/hu.po
po/invenio.pot
po/it.po
po/ja.po
po/ka.po
po/no.po
po/pl.po
po/pt.po
po/ro.po
po/ru.po
po/rw.po
po/sk.po
po/sv.po
po/uk.po
po/zh_CN.po
po/zh_TW.po

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:80d50d482f2e: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 25 2014, 11:45

Merged Changes

CommitAuthorDetailsCommitted
dca5db9a0932Tibor Simko
Invenio v1.0.6 
Jan 31 2014
f636213eb629Tibor Simko
I18N: PO file update for the release of v1.0.6 
Jan 31 2014
d45133e0c350Tibor Simko
Merge branch 'maint-0.99' into maint-1.0 
Jan 31 2014
ca432684461dTibor Simko
Invenio v0.99.9 
Jan 31 2014
fa659453a898Tibor Simko
Merge branch 'maint-0.99' into maint-1.0 
Jan 31 2014
19a5f03afb04Tibor Simko
I18N: PO file update for the release of v0.99.9 
Jan 31 2014