You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/10/20 05:25:45 UTC
[2/2] incubator-guacamole-manual git commit: GUACAMOLE-88: Merge
changes that were missing from previous failed merge.
GUACAMOLE-88: Merge changes that were missing from previous failed merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/7d53ce22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/7d53ce22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/7d53ce22
Branch: refs/heads/master
Commit: 7d53ce2247d70829185e7d7ffdaff74af0e55d16
Parents: d5f3ea9 4e065c7
Author: James Muehlner <ja...@guac-dev.org>
Authored: Wed Oct 19 22:23:54 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Wed Oct 19 22:23:54 2016 -0700
----------------------------------------------------------------------
src/chapters/adding-protocol.xml | 37 ++++++++++++++-----------
tutorials/libguac-client-ball/configure.ac | 1 +
tutorials/libguac-client-ball/src/ball.c | 15 ++++++----
3 files changed, 31 insertions(+), 22 deletions(-)
----------------------------------------------------------------------