Skip to content

Commit 419471c

Browse files
committed
Fix merge.
2 parents 9d6042b + f5264ce commit 419471c

File tree

18 files changed

+2129
-1232
lines changed

18 files changed

+2129
-1232
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
build/
22
*.so
3-
PythonExtensionPatterns/
43
doc/sphinx/build/
54
__pycache__/
65
.DS_Store

PythonExtensionPatterns.bbprojectd/paulross.bbprojectsettings

+1,128-1,172
Large diffs are not rendered by default.

PythonExtensionPatterns.bbprojectd/project.bbprojectdata

+34-34
Original file line numberDiff line numberDiff line change
@@ -30,43 +30,43 @@
3030
<dict>
3131
<key>BookmarkData</key>
3232
<data>
33-
Ym9va0gEAAAAAAQQMAAAAAAAAAAAAAAAAAAAAAAAAAAA
33+
Ym9va1QEAAAAAAQQMAAAAAAAAAAAAAAAAAAAAAAAAAAA
3434
AAAAAAAAAAAAAAAAAAAAOAMAAAUAAAABAQAAVXNlcnMA
35-
AAAIAAAAAQEAAHBhdWxyb3NzCQAAAAEBAABEb2N1bWVu
36-
dHMAAAAJAAAAAQEAAHdvcmtzcGFjZQAAABcAAAABAQAA
37-
UHl0aG9uRXh0ZW5zaW9uUGF0dGVybnMAAwAAAAEBAABk
38-
b2MABgAAAAEBAABzcGhpbngAAAYAAAABAQAAc291cmNl
39-
AAAgAAAAAQYAAAQAAAAUAAAAJAAAADgAAABMAAAAbAAA
40-
AHgAAACIAAAACAAAAAQDAACOZAIAAAAAAAgAAAAEAwAA
41-
OfoIAAAAAAAIAAAABAMAADr6CAAAAAAACAAAAAQDAAD9
42-
mAsAAAAAAAgAAAAEAwAACYM5AAAAAAAIAAAABAMAAKHM
43-
OQAAAAAACAAAAAQDAADkHjoAAAAAAAgAAAAEAwAA9R46
44-
AAAAAAAgAAAAAQYAAMAAAADQAAAA4AAAAPAAAAAAAQAA
45-
EAEAACABAAAwAQAACAAAAAAEAABBuR/7+QAAABgAAAAB
46-
AgAAAgAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAEF
47-
AAAEAAAAAwMAAAMAAAAEAAAAAwMAAAYAAAAEAAAAAwMA
48-
APUBAAAMAAAAAQEAAE1hY2ludG9zaCBIRAgAAAAEAwAA
49-
ACCIPToAAAAIAAAAAAQAAEG4IjLDAAAAJAAAAAEBAAAy
50-
NTQwQUFCQS1DNEZFLTM4MTgtQjQ3RC02MEJFOUJFMTJC
51-
MjcYAAAAAQIAAIEAAAABAAgA7xcAAAEACAAAAAAAAAAA
52-
AAEAAAABAQAALwAAAN4AAAABAgAAZTgwNDdjOWJiN2I0
53-
NjU4NTc2MDAxODM1MTE2NGZkZWE0NjE1NzVhNzswMDAw
54-
MDAwMDswMDAwMDAwMDswMDAwMDAwMDAwMDAwMDIwO2Nv
55-
bS5hcHBsZS5hcHAtc2FuZGJveC5yZWFkLXdyaXRlOzAw
56-
MDAwMDAxOzAxMDAwMDAzOzAwMDAwMDAwMDAzYTFlZjU7
57-
L3VzZXJzL3BhdWxyb3NzL2RvY3VtZW50cy93b3Jrc3Bh
58-
Y2UvcHl0aG9uZXh0ZW5zaW9ucGF0dGVybnMvZG9jL3Nw
59-
aGlueC9zb3VyY2UAAADYAAAA/v///wEAAAAAAAAAEQAA
60-
AAQQAACYAAAAAAAAAAUQAABAAQAAAAAAABAQAAB4AQAA
61-
AAAAAEAQAABoAQAAAAAAAFUQAACgAQAAAAAAAFYQAACY
62-
AQAAAAAAAAIgAABEAgAAAAAAABAgAADEAQAAAAAAABEg
63-
AAD4AQAAAAAAABIgAADYAQAAAAAAABMgAADoAQAAAAAA
64-
ACAgAAAkAgAAAAAAADAgAACYAQAAAAAAAAHAAACsAQAA
65-
AAAAABHAAAAUAAAAAAAAABLAAAC4AQAAAAAAAIDwAABQ
66-
AgAAAAAAAA==
35+
AAAIAAAAAQEAAHBhdWxyb3NzBgAAAAEBAABHaXRIdWIA
36+
ABcAAAABAQAAUHl0aG9uRXh0ZW5zaW9uUGF0dGVybnMA
37+
AwAAAAEBAABkb2MABgAAAAEBAABzcGhpbngAAAYAAAAB
38+
AQAAc291cmNlAAAgAAAAAQYAAAQAAAAUAAAAJAAAABQA
39+
AAA0AAAAVAAAAGAAAABwAAAACAAAAAQDAADwLAYAAAAA
40+
AAgAAAAEAwAApGAJAAAAAAAIAAAABAMAAJS7IwAAAAAA
41+
CAAAAAQDAAAWJzUAAAAAAAgAAAAEAwAAdzZoAAAAAAAI
42+
AAAABAMAAMc2aAAAAAAACAAAAAQDAADKNmgAAAAAAAgA
43+
AAAEAwAAzDZoAAAAAAAgAAAAAQYAAKgAAAC4AAAAyAAA
44+
ANgAAADoAAAA+AAAAAgBAAAYAQAACAAAAAAEAABBv4y4
45+
tAAAABgAAAABAgAAAgAAAAAAAAAPAAAAAAAAAAAAAAAA
46+
AAAAAAAAAAEFAAAEAAAAAwMAAAMAAAAEAAAAAwMAAAYA
47+
AAAEAAAAAwMAAPUBAAARAAAAAQkAAGZpbGU6Ly9sb2Nh
48+
bGhvc3QvAAAADAAAAAEBAABNYWNpbnRvc2ggSEQIAAAA
49+
BAMAAAAAAK3oAAAACAAAAAAEAABBvBAmtQAAACQAAAAB
50+
AQAAMDdCMTVBNkItNzU0QS0zREJELUEwQTMtRjE0MkYx
51+
RTFFNDM1GAAAAAECAACBAAAAAQAAAO8TAAABAAAAAAAA
52+
AAAAAAABAAAAAQEAAC8AAADaAAAAAQIAAGFjMDQyNGZm
53+
Mzc5YWJjMmFjOTAyYzY0Yjg5MTNhNGM3NGI2NDRjNmY7
54+
MDAwMDAwMDA7MDAwMDAwMDA7MDAwMDAwMDAwMDAwMDAy
55+
MDtjb20uYXBwbGUuYXBwLXNhbmRib3gucmVhZC13cml0
56+
ZTswMDAwMDAwMTswMTAwMDAwNDswMDAwMDAwMDAwNjgz
57+
NmNjOy91c2Vycy9wYXVscm9zcy9naXRodWIvcGF1bHJv
58+
c3MvcHl0aG9uZXh0ZW5zaW9ucGF0dGVybnMvZG9jL3Nw
59+
aGlueC9zb3VyY2UAAADkAAAA/v///wEAAAAAAAAAEgAA
60+
AAQQAACAAAAAAAAAAAUQAAAoAQAAAAAAABAQAABgAQAA
61+
AAAAAEAQAABQAQAAAAAAAFUQAACIAQAAAAAAAFYQAACA
62+
AQAAAAAAAAIgAABIAgAAAAAAAAUgAACsAQAAAAAAABAg
63+
AADIAQAAAAAAABEgAAD8AQAAAAAAABIgAADcAQAAAAAA
64+
ABMgAADsAQAAAAAAACAgAAAoAgAAAAAAADAgAACAAQAA
65+
AAAAAAHAAACUAQAAAAAAABHAAAAUAAAAAAAAABLAAACg
66+
AQAAAAAAAIDwAABUAgAAAAAAAA==
6767
</data>
6868
<key>FileURL</key>
69-
<string>file://localhost/Users/paulross/Documents/workspace/PythonExtensionPatterns/doc/sphinx/source/</string>
69+
<string>file://localhost/Users/paulross/GitHub/paulross/PythonExtensionPatterns/doc/sphinx/source/</string>
7070
<key>RelativePath</key>
7171
<string>./doc/sphinx/source</string>
7272
<key>TypeID</key>

0 commit comments

Comments
 (0)