projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1a1263 00cfe3f)
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorG. Richardson <information@lx-office-hosting.de>
Thu, 8 Nov 2012 10:34:18 +0000 (11:34 +0100)
committerG. Richardson <information@lx-office-hosting.de>
Thu, 8 Nov 2012 10:34:18 +0000 (11:34 +0100)
1  2 
bin/mozilla/am.pl patch | diff1 | diff2 | blob | history
locale/de/all patch | diff1 | diff2 | blob | history
locale/de_DE/all patch | diff1 | diff2 | blob | history

diff --cc bin/mozilla/am.pl
Simple merge
diff --cc locale/de/all
Simple merge
diff --cc locale/de_DE/all
Simple merge
Unnamed repository; edit this file 'description' to name the repository.