Merge commit 'refs/merge-requests/116' of git://gitorious.org/fg/fgdata into integration

materials.xml

@@ -182,6 +182,13 @@ Shared parameters for various materials.
   <wrapv>false</wrapv>
  </material>
 
+ <material>
+  <name>pa_no_threshold</name>
+  <texture>Runway/pa_no_threshold.png</texture>
+  <wrapu>false</wrapu>
+  <wrapv>false</wrapv>
+ </material>
+ 
  <material>
   <name>pa_stopway</name>
   <texture>Runway/pa_stopway.png</texture>
@@ -362,6 +369,12 @@ Shared parameters for various materials.
   <wrapu>false</wrapu>
  </material>
 
+ <material>
+  <name>pa_aim_uk</name>
+  <texture>Runway/pa_aim_uk.png</texture>
+  <wrapu>false</wrapu>
+ </material>
+
  <material>
   <name>pa_tz_two_a</name>
   <texture>Runway/pa_tz_two_a.png</texture>
@@ -398,6 +411,12 @@ Shared parameters for various materials.
   <wrapu>false</wrapu>
  </material>
 
+  <material>
+  <name>pa_heli</name>
+  <texture>Runway/pa_helipad.png</texture>
+  <wrapu>false</wrapu>
+ </material>
+
  <material>
   <name>pc_taxiway</name>
   <name>dirt_rwytaxiway</name>
@@ -430,6 +449,13 @@ Shared parameters for various materials.
   <wrapv>false</wrapv>
  </material>
 
+ <material>
+  <name>pc_no_threshold</name>
+  <texture>Runway/pc_no_threshold.png</texture>
+  <wrapu>false</wrapu>
+  <wrapv>false</wrapv>
+ </material>
+ 
  <material>
   <name>pc_stopway</name>
   <texture>Runway/pc_stopway.png</texture>
@@ -639,6 +665,13 @@ Shared parameters for various materials.
   <wrapu>false</wrapu>
  </material>
 
+ <material>
+  <name>pc_aim_uk</name>
+  <name>dirt_rwyaim_uk</name>
+  <texture>Runway/pc_aim_uk.png</texture>
+  <wrapu>false</wrapu>
+ </material>
+
  <material>
   <name>pc_tz_two_a</name>
   <name>dirt_rwytz_two_a</name>
@@ -681,6 +714,12 @@ Shared parameters for various materials.
   <wrapu>false</wrapu>
  </material>
 
+ <material>
+  <name>pc_heli</name>
+  <texture>Runway/pc_helipad.png</texture>
+  <wrapu>false</wrapu>
+ </material>
+
  <!-- Default Summer -->
 
  <material>