updated text info file

Signed-off-by: Marian 'VooDooMan' Meravy <vdm113@gmail.com>
Squashed merge

Signed-off-by: Marian 'VooDooMan' Meravy <vdm113@gmail.com>
updated text info file

Signed-off-by: Marian 'VooDooMan' Meravy <vdm113@gmail.com>
Squash merge

Conflicts:
	configure
	configure.in
	include/wx/mdi.h
	tests/benchmarks/bench_bench.dsp
	tests/events/propagation.cpp
	tests/exec/exec.cpp
	tests/test_test.dsp
	tests/test_test_gui.dsp

Signed-off-by: Marian 'VooDooMan' Meravy <vdm113@gmail.com>
fix EOLs

Signed-off-by: Marian 'VooDooMan' Meravy <vdm113@gmail.com>
dummy squash commit

Conflicts:
	src/unix/utilsunx.cpp
	tests/benchmarks/bench.dsw
	tests/benchmarks/bench_bench.dsp
	tests/benchmarks/bench_vc8_bench.vcproj
	tests/benchmarks/bench_vc9_bench.vcproj
	tests/benchmarks/makefile.bcc
	tests/benchmarks/makefile.gcc
	tests/benchmarks/makefile.vc
	tests/benchmarks/makefile.wat
	tests/makefile.bcc
	tests/makefile.gcc
	tests/makefile.vc
	tests/makefile.wat
	tests/test_test.dsp
	tests/test_test_gui.dsp
	tests/test_vc7_test.vcproj
	tests/test_vc7_test_gui.vcproj
	tests/test_vc8_test.vcproj
	tests/test_vc8_test_gui.vcproj
	tests/test_vc9_test.vcproj
	tests/test_vc9_test_gui.vcproj

Signed-off-by: Marian 'VooDooMan' Meravy <vdm113@gmail.com>
Conflicts:
	src/unix/utilsunx.cpp
	tests/benchmarks/bench.dsw
	tests/benchmarks/bench_bench.dsp
	tests/benchmarks/bench_vc8_bench.vcproj
	tests/benchmarks/bench_vc9_bench.vcproj
	tests/benchmarks/makefile.bcc
	tests/benchmarks/makefile.gcc
	tests/benchmarks/makefile.vc
	tests/benchmarks/makefile.wat
	tests/makefile.bcc
	tests/makefile.gcc
	tests/makefile.vc
	tests/makefile.wat
	tests/test_test.dsp
	tests/test_test_gui.dsp
	tests/test_vc7_test.vcproj
	tests/test_vc7_test_gui.vcproj
	tests/test_vc8_test.vcproj
	tests/test_vc8_test_gui.vcproj
	tests/test_vc9_test.vcproj
	tests/test_vc9_test_gui.vcproj

Signed-off-by: Marian 'VooDooMan' Meravy <vdm113@gmail.com>
sync with upstream

Signed-off-by: Marian 'VooDooMan' Meravy <vdm113@gmail.com>