projects / guacamole.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2eb16f a300b39)
Merge branch 'zhangmaike/native-client' of ssh://guacamole.git.sourceforge.net/gitroo...
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 6 Dec 2010 01:12:03 +0000 (17:12 -0800)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 6 Dec 2010 01:12:03 +0000 (17:12 -0800)

Trivial merge
Alex Bligh guacamole tree