Dolda2000 GitWeb / doldaconnect.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ae1213f) | patch
Merge commit 'refs/remotes/pubserv/master'
authorfredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Mon, 4 Jun 2007 19:15:10 +0000 (19:15 +0000)
committerfredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Mon, 4 Jun 2007 19:15:10 +0000 (19:15 +0000)
commit48f7dc10b52a13f7c5dfc11e84b428c4e3e26550
tree850c1b05fc1f26f8d7c0795b14af319bc09b3badtree | snapshot
parentae1213f75d1c5b03791405b580ff217471bc696ecommit | diff
Merge commit 'refs/remotes/pubserv/master'

Conflicts:

clients/gtk2/main.c

git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@1062 959494ce-11ee-0310-bf91-de5d638817bd
clients/gtk2/main.c diff | blob | blame | history
Dolda Connect