safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2026-03-22 13:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
83bd54192599b84e497a70dd2081657589da0780
guacamole-client/guacamole/src/main/java
History
Michael Jumper 83bd541925 Merge branch 'master' into GUAC-546-REWRITE-merge 
Conflicts:
	guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/protocol/ProtocolRetrievalService.java
2014-12-25 01:23:00 -08:00
..
net/sourceforge/guacamole/net/basic
GUAC-340: Expose available protocols within Environment.
2014-11-23 17:39:48 -08:00
org/glyptodon/guacamole/net/basic
Merge branch 'master' into GUAC-546-REWRITE-merge
2014-12-25 01:23:00 -08:00