| commit | 423e38852837d351b86ee47b9aa4e916a3988ccd | |
| author | Martin Vidner <martin@vidner.net> | |
| Fri, 14 Nov 2008 10:38:49 +0000 (14 11:38 +0100) | ||
| committer | Martin Vidner <martin@vidner.net> | |
| Fri, 14 Nov 2008 10:38:49 +0000 (14 11:38 +0100) | ||
| tree | a161a4d684375a3ea3a528da0d9c139e701bcdda | treesnapshot (tar.gz zip) |
| parent | 59bea027c97aed06302113ecfa0419a8a5db3619 | commitdiff |
| parent | 9db205d167b732af6123b7927465cbc09f153858 | commitdiff |
Merge branch 'master' of git://repo.or.cz/cnetworkmanager
Conflicts:
cnetworkmanager
Conflicts:
cnetworkmanager
| cnetworkmanager | diff1 | diff2 | blobhistory |