mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-26 06:15:16 +00:00
in trunk too
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31622 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
32d48ba0d7
commit
81bff38d56
@ -1528,7 +1528,7 @@ lib_images_files = Split('''
|
||||
vc-check-out.png
|
||||
vc-locking-toggle.png
|
||||
vc-register.png
|
||||
vc-repo-synchro.png
|
||||
vc-repo-update.png
|
||||
vc-revert.png
|
||||
view-others.png
|
||||
''')
|
||||
|
@ -433,7 +433,7 @@ dist_images_DATA = \
|
||||
images/vc-check-out.png \
|
||||
images/vc-locking-toggle.png \
|
||||
images/vc-register.png \
|
||||
images/vc-repo-synchro.png \
|
||||
images/vc-repo-update.png \
|
||||
images/vc-revert.png \
|
||||
images/view-others.png
|
||||
|
||||
|
@ -18405,7 +18405,7 @@ Control
|
||||
ssh, you will be asked in terminal window.
|
||||
LyX was tested against SVN 1.5 and 1.6
|
||||
\begin_inset Foot
|
||||
status open
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
Most of the commands will work with 1.4 too, see
|
||||
@ -18649,9 +18649,8 @@ Update local directory from repository
|
||||
|
||||
\end_inset
|
||||
|
||||
command updates the whole directory in which resides your document.
|
||||
In case of merge conflicts local version of the files are left, so no unintende
|
||||
d data loss occurs.
|
||||
command updates the whole directory and in case of merge conflicts local
|
||||
version of the files are left, so no unintended data loss occurs.
|
||||
If local changes are detected user is warned before update starts.
|
||||
\end_layout
|
||||
|
||||
|
@ -72,7 +72,7 @@ Menuset
|
||||
OptItem "Register...|R" "vc-register"
|
||||
OptItem "Check In Changes...|I" "vc-check-in"
|
||||
OptItem "Check Out for Edit|O" "vc-check-out"
|
||||
OptItem "Update local directory from repository" "vc-repo-update"
|
||||
OptItem "Update local directory from repository|d" "vc-repo-update"
|
||||
OptItem "Revert to Repository Version|v" "vc-revert"
|
||||
OptItem "Undo Last Check In|U" "vc-undo-last"
|
||||
OptItem "Show History...|H" "dialog-show vclog"
|
||||
|
Loading…
Reference in New Issue
Block a user