ninadsp fdd8b51b00 Trying to resolve a merge.

2010-07-07 18:32:41 +05:30

..

.gitignore

testing git setup - no major change made in code yet

2010-05-23 01:22:01 +05:30

af.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ar.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

az.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

be.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

be@latin.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

bg.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

bn.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

bs.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ca.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

cs.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

cy.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

da.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

de.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

el.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

en_GB.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

es.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

et.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

eu.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

fa.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

fi.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

fr.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

gl.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

he.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

hi.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

hr.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

hu.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

id.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

it.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ja.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ka.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ko.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

lt.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

lv.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

mk.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

mn.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ms.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

nb.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

nl.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

phpmyadmin.pot

Trying to resolve a merge.

2010-07-07 18:32:41 +05:30

pl.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

pt_BR.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

pt.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ro.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ru.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

si.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

sk.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

sl.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

sq.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

sr.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

sr@latin.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

sv.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ta.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

te.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

th.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

tr.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

tt.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

uk.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

ur.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

uz.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

uz@latin.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

zh_CN.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30

zh_TW.po

Merge remote branch 'origin/master'

2010-07-07 18:31:09 +05:30