| commit | 5723014b26a3a931478eb6931579b25e06ad85dd | |
| author | Petr Baudis <pasky@ucw.cz> | |
| Sat, 13 Mar 2010 21:50:18 +0000 (13 22:50 +0100) | ||
| committer | Petr Baudis <pasky@ucw.cz> | |
| Sat, 13 Mar 2010 21:50:18 +0000 (13 22:50 +0100) | ||
| tree | 70a0c7395bbb8931f4379cb6ea9f6413c1414e74 | treesnapshot (tar.gz zip) |
| parent | 9c0cb65d9b9cb6b067bf33aefa17d315c302089f | commitdiff |
| parent | 6258f980ff936baa5aa411949281be5c0285db45 | commitdiff |
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/gostyle
Conflicts:
tex/gostyle.tex
Conflicts:
tex/gostyle.tex
| tex/gostyle.tex | diff1 | diff2 | blobhistory |