Started on proxy support

This commit is contained in:
Jeroen Ketelaar
2014-02-18 17:14:49 +01:00
parent 7579dd26ea
commit b989b00d4a
2 changed files with 30 additions and 3 deletions
+2 -3
View File
@@ -47,12 +47,11 @@ parabotv2/src/META-INF/MANIFEST.MF
.idea/uiDesigner.xml
<<<<<<< HEAD
.idea/libraries/jfxrt.xml
=======
*.jar
*.classpath
*.project
>>>>>>> 18cffe02674768c9927a96cc05d2ae09e803974d
*.xml