Merge cleanups

Eyescale · Nov 29, 2012 · 9378fa8 · 9378fa8
1 parent 6c1ee16
commit 9378fa8
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/documents/design/fileFormat.shtml b/documents/design/fileFormat.shtml
@@ -352,6 +352,19 @@ observer-ref: 'string' | 'index'
 <a name="changes"></a>
 <h2>Changes</h2>
 <ul>
+  <li><a href="https://github.com/Eyescale/Equalizer/issues/186">Resistance for
+    2D load-balancers</a> added:
+    <!-- /* --><pre>
+      compound
+      {
+          load_equalizer
+          {
+              mode     [ 2D | VERTICAL | HORIZONTAL | DB ]
+              resistance [ x y ] | float  # x,y: minimum pixel delta for 2D, float: range
+          }
+      }
+    </pre><!-- */ -->
+  </li>
   <li><a href="https://github.com/Eyescale/Equalizer/issues/151">Mouse
       capture/grab</a> added:
     <!-- /* --><pre>
@@ -509,18 +522,6 @@ global
       }
     </pre><!-- */ -->
   </li>
-  <li><a href="https://github.com/Eyescale/Equalizer/issues/186">Resistance:</a>
-    <!-- /* --><pre>
-      compound
-      {
-          load_equalizer
-          {
-              mode     [ 2D | VERTICAL | HORIZONTAL | DB ]
-              resistance [ x y ] | float  # x,y: minimum pixel delta for 2D, float: range
-          }
-      }
-    </pre><!-- */ -->
-  </li>
   <li>Launch parameter cleanup after 0.9 changed launch parameters to:
     <!-- /* --><pre>
       global