diff options
author | U-Thinking\Karsten <Karsten@Thinking.(none)> | 2010-08-17 14:15:09 +0200 |
---|---|---|
committer | U-Thinking\Karsten <Karsten@Thinking.(none)> | 2010-08-17 14:15:09 +0200 |
commit | e71463e716bc2e527a5960966bcfcdc9f9fccfa8 (patch) | |
tree | 633357d1cd63fef061149fac07b9a54f6bcd44a2 /.gitignore | |
parent | f75fb90134eb1b45c8a91d82b75e4f78681062d5 (diff) | |
parent | d72bcdb8f9630ece273978d4979ea25a63e15997 (diff) |
Merge branch 'master' of git.gnumonks.org:easyhack
Conflicts:
paper/easycard.tex
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions