projects
/
vimb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ea46e52
f36b66b
)
Merge branch 'fix/hsts'.
author
Daniel Carl
<danielcarl@gmx.de>
Wed, 26 Nov 2014 12:25:40 +0000
(13:25 +0100)
committer
Daniel Carl
<danielcarl@gmx.de>
Wed, 26 Nov 2014 12:25:40 +0000
(13:25 +0100)
1
2
src/main.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/main.c
Simple merge