[icestorm] 72/75: Merge branch 'master' of github.com:cliffordwolf/icestorm

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository icestorm.

commit 103e6fd4f890b29ffc9b3b1ccbc5f11bdc62e9b7
Merge: d72b6d4 c6f1e1f
Author: Clifford Wolf <clifford at clifford.at>
Date:   Tue Oct 6 09:14:12 2015 +0200

    Merge branch 'master' of github.com:cliffordwolf/icestorm

 docs/io_tile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc docs/io_tile.html
index 8c1555f,6adc683..1a5ca61
--- a/docs/io_tile.html
+++ b/docs/io_tile.html
@@@ -120,9 -101,9 +120,9 @@@ For example the signal <span style="fon
  </p>
  
  <p>
 -Each IO Tile has 2 <tt>NegClk</tt> configuration bits, suggesting that the
 +Each IO Tile has 2 <span style="font-family:monospace">NegClk</span> configuration bits, suggesting that the
  clock signals can be inverted independently for the the two IO blocks in the
- tile. However, the Lattice tools refuse to pack to IO blocks with different block
+ tile. However, the Lattice tools refuse to pack two IO blocks with different clock
  polarity into the same IO tile. In our tests we only managed to either set or clear
  both NegClk bits.
  </p>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/icestorm.git