projects / litex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 405efc5 03ebc73)
Merge branch 'master' of https://github.com/m-labs/misoc
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Tue, 28 Jul 2015 09:59:48 +0000 (11:59 +0200)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Tue, 28 Jul 2015 09:59:48 +0000 (11:59 +0200)

Trivial merge