[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/guidl/Horizontal_Deskbar....
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright ACE-desktop/guidl/Horizontal_Deskbar.... |
Date: |
Mon, 12 Nov 2007 22:36:28 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/11/12 22:36:28
Modified files:
ACE-desktop/guidl: Horizontal_Deskbar.gdl
Added files:
ACE-desktop/icons: screen_16.png screen_32.png
Removed files:
gtkshell : test
Log message:
Fixed merge conflicts, remove gtkshell/test.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/screen_16.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/screen_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/test?cvsroot=antiright&r1=1.1&r2=0
Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file:
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl 12 Nov 2007 11:34:33 -0000
1.42
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl 12 Nov 2007 22:36:27 -0000
1.43
@@ -99,7 +99,7 @@
"ACE Text_Editor ,gtk-edit",
"ACE Calculator ,Calculator_32.png",
"ACE Sticky_Note ,todo_32.png",
- "ACE Screen ,Screen_32.png",
+ "ACE Screen ,screen_32.png",
"ACE Chat ,chat_32.png",
"ACE System_Monitor ,system_monitor_32.png";
Index: ACE-desktop/icons/screen_16.png
===================================================================
RCS file: ACE-desktop/icons/screen_16.png
diff -N ACE-desktop/icons/screen_16.png
Binary files /dev/null and /tmp/cvs36ncm7 differ
Index: ACE-desktop/icons/screen_32.png
===================================================================
RCS file: ACE-desktop/icons/screen_32.png
diff -N ACE-desktop/icons/screen_32.png
Binary files /dev/null and /tmp/cvsM2X5C7 differ
Index: gtkshell/test
===================================================================
RCS file: gtkshell/test
diff -N gtkshell/test
--- gtkshell/test 11 Jun 2007 21:32:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
->
- <menubar>
- <menu name="FileMenu" action="FileMenuAction">
- <menuitem name="New" action="New2Action" />
- <placeholder name="FileMenuAdditions" />
- </menu>
- <menu name="JustifyMenu" action="JustifyMenuAction">
- <menuitem name="Left" action="justify-left"/>
- <menuitem name="Centre" action="justify-center"/>
- <menuitem name="Right" action="justify-right"/>
- <menuitem name="Fill" action="justify-fill"/>
- </menu>
- </menubar>
- <toolbar action="toolbar1">
- <placeholder name="JustifyToolItems">
- <separator/>
- <toolitem name="Left" action="justify-left"/>
- <toolitem name="Centre" action="justify-center"/>
- <toolitem name="Right" action="justify-right"/>
- <toolitem name="Fill" action="justify-fill"/>
- <separator/>
- </placeholder>
- </toolbar>
-</ui>
-