]> git.lyx.org Git - features.git/commitdiff
projects / features.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44ee575 f80e4bd)
Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x
authorUwe Stöhr <uwestoehr@lyx.org>
Wed, 28 Mar 2012 20:51:50 +0000 (22:51 +0200)
committerUwe Stöhr <uwestoehr@lyx.org>
Wed, 28 Mar 2012 20:51:50 +0000 (22:51 +0200)
1  2 
lib/layouts/beamer.layout patch | diff1 | diff2 | blob | history
status.20x patch | diff1 | diff2 | blob | history

diff --cc lib/layouts/beamer.layout
Simple merge
diff --cc status.20x
Simple merge
Repository for new features