Merge remote-tracking branch 'origin/feature/8895_pg3_geom'

mantidproject · Feb 6, 2014 · f7a14a0 · f7a14a0
2 parents d17590d + fd3313e
commit f7a14a0
Show file tree

Hide file tree

Showing 2 changed files with 407 additions and 1 deletion.
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml b/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <instrument xmlns="http://www.mantidproject.org/IDF/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 Schema/IDFSchema.xsd" 
- last-modified="2013-10-24 11:23:55.838956" valid-to="2100-01-31 23:59:59" name="PG3" valid-from="2013-08-01 00:00:01">
+ last-modified="2013-10-24 11:23:55.838956" valid-to="2014-01-31 23:59:59" name="PG3" valid-from="2013-08-01 00:00:01">
   <!--Created by Stuart Campbell, Vickie Lynch, Peter Peterson, Janik Zikovsky-->
   <!--DEFAULTS-->
   <defaults>