]> git.lyx.org Git - features.git/commit
Merge branch 'PavelCrash2'
authorRichard Heck <rgheck@comcast.net>
Thu, 17 Nov 2011 17:54:20 +0000 (17:54 +0000)
committerRichard Heck <rgheck@comcast.net>
Thu, 17 Nov 2011 17:54:20 +0000 (17:54 +0000)
commit75dc38ca7405d8ce3add6f15cad98c9744601669
treefc84b0c00ed97b456be095fd0425b7dba0a0a81a
parentde3148c7c35cc040c050bc8f108c09c6b41ee6b3
Merge branch 'PavelCrash2'

Conflicts:
src/Buffer.cpp

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40203 a592a061-630c-0410-9148-cb99ea01b6c8
src/Buffer.cpp