Browse Source

Merge branch 'bitstream_src' into bfgminer

Luke Dashjr 12 years ago
parent
commit
01231c8a3b
3 changed files with 8 additions and 0 deletions
  1. 6 0
      .gitmodules
  2. 1 0
      bitstreams/src/X6000_ztex_comm4
  3. 1 0
      bitstreams/src/ZtexBTCMiner

+ 6 - 0
.gitmodules

@@ -1,3 +1,9 @@
 [submodule "libblkmaker"]
 	path = libblkmaker
 	url = git://gitorious.org/bitcoin/libblkmaker.git
+[submodule "bitstream/X6000_ztex_comm4"]
+	path = bitstreams/src/X6000_ztex_comm4
+	url = git://github.com/luke-jr/X6000_ztex_comm4.git
+[submodule "bitstream/ZtexBTCMiner"]
+	path = bitstreams/src/ZtexBTCMiner
+	url = git://github.com/luke-jr/ZtexBTCMiner.git

+ 1 - 0
bitstreams/src/X6000_ztex_comm4

@@ -0,0 +1 @@
+Subproject commit 90b2acba70d2476597f90479bcee65141559dd55

+ 1 - 0
bitstreams/src/ZtexBTCMiner

@@ -0,0 +1 @@
+Subproject commit de68be0121c70a51e6c64344e0d5ae502d61ce52