| commit | 5afd3cab5680b66dbc82fed2b52636a36aa5af33 | |
| author | Petr Baudis <pasky@ucw.cz> | |
| Wed, 10 Mar 2010 21:02:08 +0000 (10 22:02 +0100) | ||
| committer | Petr Baudis <pasky@ucw.cz> | |
| Wed, 10 Mar 2010 21:02:08 +0000 (10 22:02 +0100) | ||
| tree | 90e6e2f44a44bb8a1ec8922e3e215ccdab120913 | treesnapshot (tar.gz zip) |
| parent | 4c9915c294d766294207f8373b8e77c5e031d94f | commitdiff |
| parent | ed08426f96019b3d298aa524193db17120c633db | commitdiff |
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/gostyle
Conflicts:
tex/gostyle.bib
Conflicts:
tex/gostyle.bib
| tex/gostyle.bib | diff1 | diff2 | blobhistory |
| tex/gostyle.tex | diff1 | diff2 | blobhistory |