projects
/
Biblio-RFID.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
646d58d
1eaa286
)
Merge branch 'master' of mjesec.ffzg.hr:/git/Biblio-RFID
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Wed, 29 Oct 2014 13:33:21 +0000
(14:33 +0100)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Wed, 29 Oct 2014 13:33:21 +0000
(14:33 +0100)
Conflicts:
examples/selfcheck.js
Trivial merge