Merge branch 'master' into WebGUI8.

2012-01-19 11:17:44 -08:00 · 2012-01-19 11:17:44 -08:00 · 4ea362ba6f
commit 4ea362ba6f
parent e97d84fb14 c35b2e5758
6 changed files with 92 additions and 185 deletions
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@ -1,3 +1,5 @@
+7.10.25
+
 7.10.24
 - fixed #12318: asset error causes asset manager to fail
 - fixed #12308: error message used scalar as reference