feat:implementacion grafica 2.0

2026-05-22 18:51:55 -06:00
parent cb005d33f6 ffb5bdb346
commit 53610d4378
33 changed files with 851 additions and 0 deletions
--- a/linux/runner/my_application.h
+++ b/linux/runner/my_application.h
@@ -3,7 +3,14 @@

 #include <gtk/gtk.h>

+<<<<<<< HEAD
 G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
+=======
+G_DECLARE_FINAL_TYPE(MyApplication,
+                     my_application,
+                     MY,
+                     APPLICATION,
+>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902
                     GtkApplication)

 /**