Merge branch 'avrdudes:main' into issue1271

mcuee · Nov 2, 2023 · 35f735c · 35f735c
2 parents c5583cb + 96b081b
commit 35f735c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -31,6 +31,7 @@ Changes since version 7.2:
     - Read ATmega324PB and ATmega328PB serial number #1509
     - EEPROM file generates error with 7.2 #1508
     - PGM LED not activated for flash or eeprom write #1514
+    - Adding the Avrdude build version to avrdude.conf #1475
 
   * Pull requests:
 
@@ -62,6 +63,8 @@ Changes since version 7.2:
     - Review and update LED support #1528
     - Fix SerialUPDI with NVM v3 controller #1531
     - Add bootloader hashes from the Sanguino Arduino repo #1533
+    - Support MinGW cross compiler #1539
+    - Add avrdude_conf_version to grammar #1542 #1547
 
   * Internals:
 

diff --git a/src/doc/avrdude.texi b/src/doc/avrdude.texi
@@ -2822,7 +2822,7 @@ configuration file, AVRDUDE looks for a per-user configuration
 file to augment or override the system wide defaults.  On Unix, the
 per-user file is @code{$@{XDG_CONFIG_HOME@}/avrdude/avrdude.rc}, whereas
 if @code{$@{XDG_CONFIG_HOME@}} is either not set or empty,
-@code{$@{HOME@}/.config/} is used instead. If that does not exists
+@code{$@{HOME@}/.config/} is used instead. If that does not exist
 @code{.avrduderc} within the user's home directory is used. On Windows,
 this file is the @code{avrdude.rc} file located in the same directory as
 the executable.