projects
/
dana
/
obconf.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8496d6b
41fbca7
)
Merge branch 'master' of git://mika.l3ib.org/obconf
author
Dana Jansens
<danakj@orodu.net>
Fri, 25 Jan 2008 03:06:48 +0000
(22:06 -0500)
committer
Dana Jansens
<danakj@orodu.net>
Fri, 25 Jan 2008 03:06:48 +0000
(22:06 -0500)
Conflicts:
po/sv.po
1
2
po/sv.po
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
po/sv.po
Simple merge
projects / dana / obconf.git / commitdiff