Mercurial > hg > toolkit / file diff

--- a/application/main.c	Wed Apr 02 09:59:38 2014 +0200
+++ b/application/main.c	Wed Apr 02 13:21:11 2014 +0200
@@ -118,13 +118,18 @@
     ui_menuitem("Dokument 1", action_doc1, NULL);
     ui_menuitem("Dokument 2", action_doc2, NULL);
     void ui_menuseparator();
-    ui_menuseparator();
+    
     ui_checkitem_nv("Check", "check1");
     //ui_checkitem("Check", action_open, NULL);
+<<<<<<< local
+    
+=======
     ui_menuitem_st(UI_STOCK_CLOSE, action_close, NULL);
+>>>>>>> other
     void ui_menuseparator();
     ui_menuitem_list(list, action_document, list);
-    
+    ui_menuseparator();
+    ui_menuitem("Close", action_close, NULL);
     
     
     ui_toolitem_st("new", UI_STOCK_NEW, action_new, NULL);