Commit fd60ce9e7e6a3b84196aa6c320a80c9ce705c4f2
authorMichel Pollet <buserror@gmail.com>
Wed, 6 Nov 2013 15:16:19 +0000 (15:16 +0000)
committerMichel Pollet <buserror@gmail.com>
Wed, 6 Nov 2013 15:16:19 +0000 (15:16 +0000)
tree653978f4d2aa6aa684a53fac8e19b4e35f14b33a
parent6dd257f754fb29815eac1123e1ed97eead1d10cb
parentf35aeb7ff472734567fbe15cdf5b89ad71007b04
Message:
Merge branch 'master' of /home/michel/Sources/Embedded/simavr

Conflicts:
shared/simavr/Makefile
Makefile