Merge branch 'jonte'

Conflicts:
	report.lyx
This commit is contained in:
Jonatan Pålsson 2011-04-30 23:09:07 +02:00
commit 2f2c5ab590
5 changed files with 4167 additions and 997 deletions

BIN
graphics/Chess_no_text.dia Normal file

Binary file not shown.

File diff suppressed because it is too large Load diff

BIN
graphics/theory_layout.dia Normal file

Binary file not shown.

1070
graphics/theory_layout.eps Normal file

File diff suppressed because it is too large Load diff

2025
report.lyx

File diff suppressed because it is too large Load diff