projects / platform / upstream / openconnect.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d804c2 244e66b)
Merge branch 'master' into nm-ui-rewrite
authorJussi Kukkonen <jku@linux.intel.com>
Tue, 3 Feb 2009 12:30:30 +0000 (14:30 +0200)
committerJussi Kukkonen <jku@linux.intel.com>
Tue, 3 Feb 2009 12:30:30 +0000 (14:30 +0200)
Conflicts:

nm-auth-dialog.c


Trivial merge
Domain: Network & Connectivity / Data Network; Licenses: LGPL-2.1+;