Commit 5b98026

committed

Merge branch 'update_clients_take2' back into master.

Master now contains all of Grant He's updates and also contains modifications to the webwork webservice Conflicts: lib/WeBWorK/ContentGenerator.pm lib/WeBWorK/ContentGenerator/Problem.pm

2 parents d4580a7 + 0c2e85e commit 5b98026Copy full SHA for 5b98026

6 files changed

+265

-509

lines changed

.gitignore
clients
- renderProblem.pl
- webwork_xmlrpc_client.pl
lib
- WeBWorK/ContentGenerator
  - renderViaXMLRPC.pm
- WebworkClient.pm
- WebworkWebservice.pm

6 files changed

+265

-509

lines changed

`‎.gitignore`

+2-1

-Original file line number
+Diff line change
 .svn
 .DS_Store
 +.*
 htdocs/tmp/*
 tmp/*
 logs/*
 conf/*.conf
 -conf/*.apache2-config
 +conf/*.apache2-config

Comments

(0)