Skip to content

Commit

Permalink
rebase on to current master
Browse files Browse the repository at this point in the history
  • Loading branch information
CorvetteCole committed Apr 21, 2021
2 parents 247a7a9 + da8b947 commit 9a12f3a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions src/prefs.ui
Original file line number Diff line number Diff line change
Expand Up @@ -210,25 +210,14 @@
</layout>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="can_focus">0</property>
<property name="orientation">vertical</property>
<layout>
<property name="column">0</property>
<property name="row">12</property>
<property name="column-span">2</property>
</layout>
</object>
</child>
<!--! MISC !-->
<child>
<object class="GtkSeparator">
<property name="can_focus">0</property>
<property name="orientation">vertical</property>
<layout>
<property name="column">0</property>
<property name="row">11</property>
<property name="row">12</property>
<property name="column-span">2</property>
</layout>
</object>
Expand All @@ -241,7 +230,7 @@
<property name="justify">center</property>
<layout>
<property name="column">0</property>
<property name="row">12</property>
<property name="row">13</property>
<property name="row-span">1</property>
</layout>
</object>
Expand All @@ -256,7 +245,7 @@
<signal name="value-changed" handler="dash_opacity_changed" swapped="no" />
<layout>
<property name="column">1</property>
<property name="row">12</property>
<property name="row">13</property>
</layout>
</object>
</child>
Expand Down
Binary file added src/schemas/gschemas.compiled
Binary file not shown.

0 comments on commit 9a12f3a

Please sign in to comment.