Skip to content

Commit b2aedc0

Browse files
committed
Merge EbookFoundation#7033 into normalize-authoring-format
Solve conflicts with branch 'upstream/main' until this PR/commit adding theirs resources too behind conflictive hunk
2 parents 1833c6d + 560691e commit b2aedc0

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

books/free-programming-books-langs.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2005,6 +2005,7 @@ That section got so big, we decided to split it into its own file, the [BY SUBJE
20052005
### QML
20062006

20072007
* [Qt5 Cadaques](http://qmlbook.github.io) - Juergen Bocklage-Ryannel, Johan Thelin (HTML, PDF, ePub) (:construction: *in process*)
2008+
* [Qt6 Book](https://www.qt.io/product/qt6/qml-book/preface-preface) - Johan Thelin, Jürgen Bocklage-Ryannel, Cyril Lorquet (HTML, PDF) (:construction: *in process*)
20082009

20092010

20102011
### R

0 commit comments

Comments
 (0)