Dolda2000 GitWeb / doldaconnect.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c24b92 4b9af9b)
Merge branch 'dolcon-split'
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 21 Jul 2007 03:51:02 +0000 (05:51 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 21 Jul 2007 03:51:02 +0000 (05:51 +0200)
Conflicts:

po/sv.po

1  2 
clients/gtk2/Makefile.am patch | diff1 | diff2 | blob | history
config/util/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc clients/gtk2/Makefile.am
Simple merge
diff --cc config/util/Makefile.am
Simple merge
Dolda Connect