Merge branch 'dev' of git.coding.net:virusdefender/qduoj into dev

Conflicts:
	template/src/oj/problem/problem.html
This commit is contained in:
sxw@401
2015-09-08 18:55:17 +08:00
30 changed files with 559 additions and 152 deletions

View File

@@ -72,13 +72,13 @@
<div>
<label class="radio-inline">
<input type="radio" name="language" value="1" checked> C (gcc 4.8)
<input type="radio" name="language" value="1" checked> C (GCC 4.8)
</label>
<label class="radio-inline">
<input type="radio" name="language" value="2"> C++ (g++ 4.3)
<input type="radio" name="language" value="2"> C++ (G++ 4.3)
</label>
<label class="radio-inline">
<input type="radio" name="language" value="3"> Java (jre 1.7)
<input type="radio" name="language" value="3"> Java (Oracle JDK 1.7)
</label>
</div>
</div>