Merge branch 'master' of https://github.com/lasybear/sph-sgminer_x11mod

Conflicts: README.md modified: README.md
jcaferjr · May 26, 2014 · 49bf6ad · 49bf6ad
2 parents 5136036 + 01e805d
commit 49bf6ad
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,14 @@ License: GPLv3.  See `COPYING` for details.
 ## Mod x11 (separate kernels)
 
 0. Use "kernel" : "x11mod" in config file or -k x11mod via command line.
+<<<<<<< HEAD
 1. In case of instability please set a little bit lower engine frequency than a original sgminer.
+=======
+1. Do not use intensity higher than 15.
+2. In case of instability please set a little bit lower engine frequency than a original sgminer.
+3. Tested only on Ubuntu x64 and BAMT. 
+4. Tested only on single R9 280x and rig of 5 x R9 270x.
+>>>>>>> 01e805db4490fa607d233d3a5feb96eeb48c779c
 
 My experience:
 MSI R9 280x 3.4 MH/s