http://git.etersoft.ru/projects
/
wine
/
eterwine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5753fce
b0d6bdb
)
Merge branch 'eter-1.0.12' of git.office:/projects/eterhack into eter-1.0.12
author
Vitaly Lipatov
<lav@etersoft.ru>
Thu, 11 Mar 2010 19:25:58 +0000
(22:25 +0300)
committer
Vitaly Lipatov
<lav@etersoft.ru>
Thu, 11 Mar 2010 19:25:58 +0000
(22:25 +0300)
Conflicts:
etersoft/scripts/wine.in
Trivial merge