Commit Graph

313 Commits

Author SHA1 Message Date
Lars Gullik Bjønnes
ddbafa138f remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15051 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-18 19:31:35 +00:00
Lars Gullik Bjønnes
3965875172 Remerge after mathed filename changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15034 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-17 20:40:15 +00:00
Lars Gullik Bjønnes
eec4492cb4 Remerge. Update nb.po a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14950 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-09 11:10:26 +00:00
Jean-Marc Lasgouttes
e0cf54f37c * po/*.po:
* po/POTFILES.in: remerge

	* po/Makefile.in.in: get rid of Qt shortcuts


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14697 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-16 09:57:24 +00:00
Lars Gullik Bjønnes
22861453fe Remove the XForms frontend, update the autotools files, and fixup po.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14320 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 19:20:25 +00:00
Lars Gullik Bjønnes
3d9b16f9e2 remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13209 a592a061-630c-0410-9148-cb99ea01b6c8
2006-02-11 19:47:05 +00:00
Lars Gullik Bjønnes
e65ec11f9d remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10795 a592a061-630c-0410-9148-cb99ea01b6c8
2006-01-29 14:37:27 +00:00
Lars Gullik Bjønnes
aa485c36b4 remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10792 a592a061-630c-0410-9148-cb99ea01b6c8
2006-01-28 22:01:12 +00:00
Lars Gullik Bjønnes
908f814920 remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10681 a592a061-630c-0410-9148-cb99ea01b6c8
2005-12-23 18:52:43 +00:00
Lars Gullik Bjønnes
3fd20621a5 remove obsolete entries
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10667 a592a061-630c-0410-9148-cb99ea01b6c8
2005-12-18 14:49:43 +00:00
Lars Gullik Bjønnes
da8338a660 remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10666 a592a061-630c-0410-9148-cb99ea01b6c8
2005-12-18 14:32:23 +00:00
Lars Gullik Bjønnes
387fafc5d3 remerge and CRLF removal
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10567 a592a061-630c-0410-9148-cb99ea01b6c8
2005-10-23 13:26:52 +00:00
Lars Gullik Bjønnes
21148fd4b0 nb -> no
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10531 a592a061-630c-0410-9148-cb99ea01b6c8
2005-10-09 00:02:38 +00:00