anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

whitespace changes and remove conflict marker

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9926 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-05-09 17:43:13 +00:00
parent 92379230ff
commit 5aaf902724
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ChangeLog
View File

@ -28,8 +28,8 @@
2005-04-28 Michael Schmitt <michael.schmitt@teststep.org>
* layouts/*.layout:
* layouts/*.inc: All Style, NoStyle and CopyStyle commands
* layouts/*.layout:
* layouts/*.inc: All Style, NoStyle and CopyStyle commands
use a _ for spaces instead of quotes
2005-04-25 Martin Vermeer <martin.vermeer@hut.fi>
@ -111,7 +111,6 @@
* reLyX/syntax.default: update natbib/jurabib commands, add
\DescribeMacro, \let, \subfigure and bibunit commands
>>>>>>> 1.685
2005-02-20 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* layouts/stdlayouts.inc: change labelstring to "Senseless!"