From af5d3f5f6c1887216d1c40e242b0d04959f015c2 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 28 Jun 2009 12:24:52 +0000 Subject: [PATCH] Backport r30289, r30290 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30291 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/scons_manifest.py | 11 ++++++----- lib/Makefile.am | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index de84269e2e..b44708f8d5 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -1389,6 +1389,7 @@ lib_images_files = Split(''' dialog-show_mathmatrix.png dialog-show_print.png dialog-show_spellchecker.png + dialog-show_vclog.png dialog-toggle_toc.png down.png ert-insert.png @@ -1417,11 +1418,6 @@ lib_images_files = Split(''' layout_Section.png lyx-quit.png lyx.png - vc-check-in.png - vc-check-out.png - dialog-show_vclog.png - vc-register.png - vc-revert.png marginalnote-insert.png math-display.png math-macro-add-greedy-optional-param.png @@ -1484,6 +1480,11 @@ lib_images_files = Split(''' unknown.png up.png url-insert.png + vc-check-in.png + vc-check-out.png + vc-locking-toggle.png + vc-register.png + vc-revert.png ''') diff --git a/lib/Makefile.am b/lib/Makefile.am index 7990548e3f..9ef6cca8c8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -316,6 +316,7 @@ dist_images_DATA = \ images/dialog-show_mathmatrix.png \ images/dialog-show_print.png \ images/dialog-show_spellchecker.png \ + images/dialog-show_vclog.png \ images/dialog-toggle_toc.png \ images/down.png \ images/ert-insert.png \ @@ -344,11 +345,6 @@ dist_images_DATA = \ images/layout_Section.png \ images/lyx-quit.png \ images/lyx.png \ - images/vc-check-in.png \ - images/vc-check-out.png \ - images/dialog-show_vclog.png \ - images/vc-register.png \ - images/vc-revert.png \ images/marginalnote-insert.png \ images/math-display.png \ images/math-macro-add-greedy-optional-param.png \ @@ -410,7 +406,12 @@ dist_images_DATA = \ images/undo.png \ images/unknown.png \ images/up.png \ - images/url-insert.png + images/url-insert.png \ + images/vc-check-in.png \ + images/vc-check-out.png \ + images/vc-locking-toggle.png \ + images/vc-register.png \ + images/vc-revert.png imagesmathdir = $(imagesdir)/math dist_imagesmath_DATA = \