merged mgage/master

aubreyja · Feb 25, 2012 · c4fdd04 · c4fdd04
2 parents 7276f0e + 50d1d35
commit c4fdd04
Show file tree

Hide file tree

Showing 74 changed files with 17,674 additions and 3,913 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
-*.conf
-*.apache2-config
-*.log
-tmp/**
-DATA/**
-logs/**
-
+.svn
+.DS_Store
+.*
+htdocs/tmp/*
+tmp/*
+logs/*
+conf/*.conf
+conf/*.apache2-config
diff --git a/clients/input.txt b/clients/input.txt
@@ -11,7 +11,7 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(&beginproblem);
+TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 $a = random(-10,-1,1);
 $b = random(1,11,1);