projects / litex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc8d844 1d9771f)
Merge branch 'master' of https://github.com/m-labs/misoc
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Mon, 27 Apr 2015 13:28:08 +0000 (15:28 +0200)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Mon, 27 Apr 2015 13:28:08 +0000 (15:28 +0200)

Trivial merge