Skip to content

Commit f106fa5

Browse files
committed
git subrepo pull uno
subrepo: subdir: "uno" merged: "c1a100b6" upstream: origin: "https://github.com/prrvchr/uno.git" branch: "main" commit: "c1a100b6" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "4f60dd7"
1 parent 6ab23df commit f106fa5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

uno/.gitrepo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/prrvchr/uno.git
88
branch = main
9-
commit = 71034eaa9f7627b2689444c2b80850322e67f5ea
10-
parent = fef5b466ad2244e1225b730b5c8930a747c9181c
9+
commit = c1a100b6f093ceef9aef387d4e88660e70568d3f
10+
parent = 6ab23df5dd63d796e2894312422010362da34326
1111
method = merge
1212
cmdver = 0.4.9

uno/dialog/wizard/Wizard.xdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
╚════════════════════════════════════════════════════════════════════════════════════╝
2626
-->
2727
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
28-
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Wizard" dlg:left="0" dlg:top="0" dlg:width="385" dlg:height="205" dlg:help-text="&amp;Wizard.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;Wizard.Title" dlg:withtitlebar="true">
28+
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Wizard" dlg:left="10" dlg:top="10" dlg:width="385" dlg:height="205" dlg:help-text="&amp;Wizard.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;Wizard.Title" dlg:withtitlebar="true">
2929
<dlg:bulletinboard>
3030
<dlg:button dlg:id="CommandButton5" dlg:tab-index="1" dlg:disabled="true" dlg:left="5" dlg:top="186" dlg:width="50" dlg:height="15" dlg:help-text="&amp;Wizard.CommandButton5.HelpText" dlg:value="&amp;Wizard.CommandButton5.Label">
3131
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:Help" script:language="UNO"/>
-29 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)