Cody Schafer avatar Cody Schafer committed 8369660 Merge

Nasty merge.

Comments (0)

Files changed (2)

+# HG changeset patch
+# Parent bd6441b455d67b79ccda63639e837f42b27c0095
+
+diff --git a/config/debug/gdb.in b/config/debug/gdb.in
+--- a/config/debug/gdb.in
++++ b/config/debug/gdb.in
+@@ -33,6 +33,12 @@
+ # Don't remove next line
+ # CT_INSERT_VERSION_BELOW
+ 
++config GDB_V_7_5.1
++    bool
++    prompt "7.5.1 (EXPERIMENTAL)"
++    select GDB_7_0_or_later
++    select GDB_7_2_or_later
++
+ config GDB_V_linaro_7_5_2012_12_1
+     bool
+     prompt "linaro-7.5-2012.12-1"
+@@ -143,6 +149,7 @@
+     string
+ # Don't remove next line
+ # CT_INSERT_VERSION_STRING_BELOW
++    default "7.5.1" if GDB_V_7_5_1
+     default "linaro-7.5-2012.12-1" if GDB_V_linaro_7_5_2012_12_1
+     default "7.5" if GDB_V_7_5
+     default "linaro-7.4-2012.06" if GDB_V_linaro_7_4_2012_06
 multilib-fix.diff
 strace-4.7.diff
 binutils-2.22-similfy-config.diff
+<<<<<<< local
+=======
+gdb-7.5-add.diff
+gdb-7.5.1.diff
+>>>>>>> other
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.