git.lyx.org Git - features.git/commit

author	Juergen Spitzmueller <spitz@lyx.org>
	Tue, 20 Nov 2012 17:11:14 +0000 (18:11 +0100)
committer	Juergen Spitzmueller <spitz@lyx.org>
	Tue, 20 Nov 2012 17:11:14 +0000 (18:11 +0100)
commit	b95c17cfdd469aac842304073a56e3fb64bfe629
tree	f9c4df4c8ad8a565459ea53faee5b88b5b17c318	tree \| snapshot
parent	99e611b2d8cf78fada22e38dbc6684ce0f76f092	commit \| diff
parent	34ef91bb70937c68462fd82fdc9373b0235e0492	commit \| diff

Merge remote-tracking branch 'origin/master' into features/latexargs

Conflicts:
src/Text3.cpp