merge stable branch changes -r349:393
authorkonrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Sun, 12 Jul 2009 11:24:04 +0000 (11:24 +0000)
committerkonrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Sun, 12 Jul 2009 11:24:04 +0000 (11:24 +0000)
commitba1d3063026369b5e6257918d54fd33292d1a6bf
tree966c631921319fa36a6742e3c5f0ec886c5cfe6e
parent9c835ef2d47b0c0efea1537e0a5c9075b9166f13
merge stable branch changes -r349:393

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@286 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
src/misc.cpp
src/office.cpp
src/office.h
src/overview.cpp
src/smoke_de.ts
src/smoke_de_SAX.ts
src/smoke_en.ts
src/user.cpp
www/inc/machine/session.php