summaryrefslogtreecommitdiff
path: root/dataobject.ini
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-10 00:51:26 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-10 00:51:26 -0400
commit7e38142d4aa080767617724a98c0cf60c70961d0 (patch)
treed4befe70bb5f82fa78b82465ddec597e1d67f72e /dataobject.ini
parent4b656f47dff2bd6eed4dcfad060b8434d052d883 (diff)
Resolve conflicts and convert _t( to _( where it was introduced again.
darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
Diffstat (limited to 'dataobject.ini')
0 files changed, 0 insertions, 0 deletions