DELTA 403662 123 22 SVN[\  /,/+ENDREP DELTA SVN*,**--- src/colormap.h.orig 2015-03-05 16:25:10 UTC +++ src/colormap.h @@ -5,9 +5,11 @@ #include #include "linalg.h" +#ifndef Q_MOC_RUN #include #include #include +#endif namespace fs = boost::filesystem; ENDREP DELTA SVNOQOO--- src/scintillaeditor.h.orig 2015-03-05 20:25:13 UTC +++ src/scintillaeditor.h @@ -11,9 +11,11 @@ #include "scadlexer.h" #include "parsersettings.h" +#ifndef Q_MOC_RUN #include #include #include +#endif class EditorColorScheme { ENDREP id: 5-280009.0.r408473/744 type: file pred: 5-280009.0.r403662/13105 count: 20 text: 408473 0 24 1372 15ce45021946dcdfcf7eed92c0b4e179 770fc23b321d2d103b4e2377293bc53c59dd82bd 408472-8r6h/_4 props: 300914 71 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/cad/openscad/Makefile copyroot: 0 / id: 6-408473.0.r408473/1041 type: file count: 0 text: 408473 51 315 298 498f15145c51542e88c53c9c1fd68b01 80a78c50554cb4dea632ce6da445182e2e344fd5 408472-8r6h/_8 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/cad/openscad/files/patch-src_colormap.h copyroot: 0 / id: 9-408473.0.r408473/1327 type: file count: 0 text: 408473 379 352 335 8ae288076f27001293dbc77d95575b61 231e2f544bf7d81b5aeeb6eb322f56982c51fcd1 408472-8r6h/_a props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/cad/openscad/files/patch-src_scintillaeditor.h copyroot: 0 / PLAIN K 20 patch-src_colormap.h V 28 file 6-408473.0.r408473/1041 K 27 patch-src_scintillaeditor.h V 28 file 9-408473.0.r408473/1327 END ENDREP id: 5-408473.0.r408473/1765 type: dir count: 0 text: 408473 1621 131 0 ff38a2d4a39b2ff092a622c231f38445 cpath: /head/cad/openscad/files copyroot: 0 / PLAIN K 8 Makefile V 27 file 5-280009.0.r408473/744 K 8 distinfo V 28 file 8-280009.0.r382332/1530 K 5 files V 27 dir 5-408473.0.r408473/1765 K 9 pkg-descr V 30 file e-280009.0.r340718/937059 K 9 pkg-plist V 28 file g-280009.0.r382332/1829 END ENDREP id: 4-280009.0.r408473/2167 type: dir pred: 4-280009.0.r403662/13614 count: 26 text: 408473 1916 238 0 ba751b406134044da7039567ceb4b547 cpath: /head/cad/openscad copyroot: 0 / PLAIN K 8 Makefile V 24 file 2-755.0.r407822/647 K 6 admesh V 28 dir 4-90740.0.r405891/199989 K 4 adms V 27 dir 4-169094.0.r366664/1168 K 8 alliance V 28 dir 4-109077.0.r386097/97072 K 11 astk-client V 27 dir 4-85437.0.r348597/16095 K 12 astk-serveur V 26 dir 4-85435.0.r379319/5626 K 4 atlc V 28 dir 4-70060.0.r405891/200671 K 8 basicdsp V 28 dir 4-218728.0.r397077/69560 K 10 brickutils V 29 dir 4-347198.0.r394778/186605 K 6 brlcad V 28 dir 4-129418.0.r405449/10683 K 8 calculix V 26 dir 4-80178.0.r405510/7200 K 7 cascade V 28 dir 4-70051.0.r386312/333733 K 9 chipvault V 28 dir 4-74193.0.r340718/905399 K 5 cider V 28 dir 4-24053.0.r394778/187340 K 11 cura-engine V 28 dir 4-364337.0.r397395/70323 K 9 dinotrace V 28 dir 4-113000.0.r394780/58172 K 7 dxf2fig V 29 dir 4-117302.0.r340722/517511 K 8 electric V 25 dir 2-31125.0.r404431/932 K 11 electric-ng V 27 dir 4-174152.0.r389865/1342 K 8 elmerfem V 28 dir 4-370235.0.r385521/62045 K 6 feappv V 26 dir 4-158739.0.r404430/605 K 8 fidocadj V 29 dir 4-296050.0.r394778/188782 K 7 freehdl V 26 dir 4-176541.0.r390168/591 K 8 fritzing V 27 dir 4-407684.0.r407684/5850 K 9 gdsreader V 27 dir 4-191068.0.r366654/1133 K 3 gdt V 28 dir 4-191098.0.r398832/65184 K 4 geda V 28 dir 2-15151.0.r405891/201394 K 5 gerbv V 28 dir 4-63026.0.r405891/202073 K 4 ghdl V 26 dir 4-387985.0.r408367/715 K 4 gmsh V 26 dir 4-85448.0.r406543/1860 K 8 gmsh-occ V 27 dir 4-225061.0.r406542/2254 K 6 gnucap V 28 dir 4-54293.0.r394778/190966 K 7 gplcver V 29 dir 4-152326.0.r357139/129273 K 8 gspiceui V 27 dir 4-169394.0.r401047/3832 K 7 gtkwave V 34 dir 4-212528.0-303646.r408305/1149 K 6 impact V 29 dir 4-130327.0.r367888/458850 K 5 irsim V 23 dir 2-594.0.r399167/964 K 8 iverilog V 25 dir 4-38298.0.r405903/605 K 7 jspice3 V 27 dir 4-167526.0.r403633/1602 K 5 kicad V 26 dir 4-150689.0.r399933/938 K 11 kicad-devel V 27 dir q-150689.0.r407239/1581 K 7 klayout V 27 dir 4-191075.0.r390712/1126 K 12 layouteditor V 29 dir 4-267410.0.r386312/338209 K 5 ldraw V 27 dir 4-314115.0.r383822/1111 K 6 leocad V 28 dir 4-55432.0.r390310/115648 K 8 librecad V 26 dir 2-288505.0.r395655/644 K 12 linux-eagle5 V 27 dir g-52211.0.r371238/38315 K 7 logisim V 26 dir 4-313229.0.r375015/500 K 5 magic V 25 dir 2-593.0.r371238/39035 K 7 meshdev V 27 dir 4-290494.0.r397375/1372 K 7 meshlab V 27 dir 4-269134.0.r402167/1079 K 6 netgen V 26 dir 4-108482.0.r406726/607 K 14 ngspice_rework V 27 dir 4-54430.0.r371238/41190 K 11 opencascade V 26 dir 4-188917.0.r402778/719 K 8 openscad V 27 dir 4-280009.0.r408473/2167 K 7 openvsp V 26 dir 4-295250.0.r395630/555 K 7 p5-GDS2 V 29 dir 4-191096.0.r373448/998264 K 15 p5-Verilog-Perl V 29 dir 4-234576.0.r396892/148700 K 3 pcb V 26 dir 3-276.0.r394778/196263 K 7 pdnmesh V 28 dir 4-48761.0.r405891/202759 K 8 py-pycam V 33 dir 4-407489.0-407822.r407824/208 K 9 pythoncad V 25 dir 4-93776.0.r394867/606 K 4 qcad V 34 dir 4-23796.0-325094.r406117/26093 K 13 qcad-partslib V 27 dir 4-105493.0.r403633/2240 K 12 qelectrotech V 27 dir 4-258017.0.r395712/1671 K 4 qfsm V 28 dir 4-57583.0.r405891/203487 K 4 qmls V 29 dir 4-51304.0.r340725/1126032 K 4 qucs V 36 dir 4-137272.0-372825.r405891/204275 K 10 repsnapper V 28 dir 4-305014.0.r395464/12986 K 7 sceptre V 25 dir 4-38200.0.r404429/727 K 6 scotch V 29 dir 4-155160.0.r394778/198411 K 5 spice V 27 dir 2-3120.0.r394778/199131 K 8 stepcode V 27 dir 4-391246.0.r391246/3388 K 11 sweethome3d V 29 dir 4-314867.0.r405891/204990 K 6 tkgate V 26 dir 4-390482.0.r391493/618 K 7 tochnog V 28 dir 4-84798.0.r394778/199858 K 9 transcalc V 27 dir 4-65722.0.r371238/49913 K 6 varkon V 25 dir 4-81567.0.r404422/611 K 15 verilog-mode.el V 29 dir 4-225826.0.r405891/205699 K 8 xcircuit V 27 dir 2-11041.0.r395047/65806 K 3 z88 V 27 dir 4-127103.0.r404471/1015 END ENDREP id: 1-276.0.r408473/6104 type: dir pred: 1-276.0.r408367/4646 count: 2333 text: 408473 2344 3747 0 46da22e316ec9220ba6ce8bacba58fab cpath: /head/cad copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r391201/64 K 10 .gitignore V 26 file 1-348322.0.r376072/79 K 7 CHANGES V 27 file 1-99373.0.r408449/3932 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r404934/49 K 4 GIDs V 28 file 1-168311.0.r408301/3154 K 8 Keywords V 27 dir 1-314142.0.r399974/1114 K 5 LEGAL V 25 file 1-748.0.r405033/4740 K 5 MOVED V 26 file 1-69878.0.r408358/285 K 8 Makefile V 22 file 1-6.0.r365265/122 K 2 Mk V 22 dir 1-5.0.r408454/6931 K 6 README V 25 file 1-2408.0.r340854/956 K 9 Templates V 24 dir 1-2932.0.r400392/749 K 5 Tools V 26 dir 3-15302.0.r404230/2865 K 4 UIDs V 28 file 4-168311.0.r408301/3435 K 8 UPDATING V 28 file 1-102685.0.r407371/1950 K 13 accessibility V 27 dir 1-42583.0.r407788/12700 K 6 arabic V 27 dir 1-38973.0.r403932/40966 K 9 archivers V 25 dir 1-242.0.r408449/23750 K 5 astro V 24 dir 1-301.0.r407851/6592 K 5 audio V 25 dir 1-148.0.r408472/44776 K 10 benchmarks V 23 dir 1-62.0.r408339/4430 K 7 biology V 25 dir 1-9066.0.r408287/5587 K 3 cad V 24 dir 1-276.0.r408473/6104 K 7 chinese V 25 dir 1-3770.0.r408432/8547 K 5 comms V 24 dir 1-76.0.r408337/10079 K 10 converters V 25 dir 1-1561.0.r407741/9849 K 9 databases V 25 dir 1-771.0.r408349/57061 K 9 deskutils V 26 dir 1-2098.0.r408365/15235 K 5 devel V 25 dir 1-73.0.r408451/289424 K 3 dns V 26 dir 1-6145.0.r408129/10980 K 7 editors V 23 dir 4-6.0.r408458/16602 K 9 emulators V 24 dir 1-181.0.r408456/9194 K 7 finance V 26 dir 1-4110.0.r407125/11857 K 6 french V 28 dir 1-25673.0.r408432/302701 K 3 ftp V 24 dir 1-199.0.r408411/5471 K 5 games V 25 dir 1-104.0.r408414/58229 K 6 german V 27 dir 1-7451.0.r408432/305029 K 8 graphics V 24 dir 1-94.0.r408470/56253 K 6 hebrew V 26 dir 3-31142.0.r408210/1499 K 9 hungarian V 28 dir 1p-38973.0.r404140/98839 K 3 irc V 23 dir 1-42.0.r408381/7389 K 8 japanese V 25 dir 1-410.0.r408232/16659 K 4 java V 25 dir 1-2798.0.r408079/6549 K 6 korean V 25 dir 1-5873.0.r408211/2801 K 4 lang V 24 dir 1-15.0.r408380/17613 K 4 mail V 24 dir 1-57.0.r408379/38602 K 4 math V 25 dir 1-162.0.r408467/38000 K 4 misc V 24 dir 7-35.0.r408134/25849 K 10 multimedia V 26 dir d-333.0.r408449/391538 K 3 net V 24 dir 1-22.0.r408465/71820 K 6 net-im V 29 dir 15-11144.0.r408449/402086 K 8 net-mgmt V 26 dir r-1011.0.r408457/19213 K 7 net-p2p V 28 dir g-29106.0.r408449/408267 K 4 news V 24 dir 1-145.0.r408195/5976 K 4 palm V 28 dir 1-6646.0.r405891/1383300 K 6 polish V 27 dir tv-38973.0.r408212/2308 K 10 ports-mgmt V 25 dir 1-5132.0.r408354/4719 K 10 portuguese V 28 dir 1-17842.0.r408432/306799 K 5 print V 24 dir 1-79.0.r408242/14306 K 7 russian V 27 dir 1-1559.0.r408432/310011 K 7 science V 26 dir n-5356.0.r408407/10158 K 8 security V 25 dir 1-269.0.r408466/59978 K 6 shells V 22 dir w-6.0.r407992/2736 K 8 sysutils V 25 dir b-339.0.r408462/59825 K 8 textproc V 25 dir 1-322.0.r408468/92996 K 9 ukrainian V 28 dir g-39704.0.r404140/127880 K 10 vietnamese V 25 dir 1-4812.0.r408217/1731 K 3 www V 26 dir 1-114.0.r408436/144970 K 3 x11 V 24 dir 1-16.0.r408463/26981 K 10 x11-clocks V 27 dir 1-931.0.r405891/1901716 K 11 x11-drivers V 27 dir 1-157567.0.r408464/3838 K 6 x11-fm V 24 dir 1-691.0.r407702/3068 K 9 x11-fonts V 25 dir 1-543.0.r408168/11562 K 11 x11-servers V 25 dir 1n-710.0.r404604/1547 K 10 x11-themes V 27 dir 1-14410.0.r408248/10388 K 12 x11-toolkits V 25 dir 1-120.0.r408471/16588 K 6 x11-wm V 23 dir 1-40.0.r407706/9669 END ENDREP id: 2-1.0.r408473/9683 type: dir pred: 2-1.0.r408472/48361 count: 405624 text: 408473 6268 3402 0 709507cebd83c45c0fc56045cbba933e props: 7322 2587 45 0 7a04b33bf8e35fd5c3d111baaf403dc5 cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r408435/61813 K 4 head V 22 dir 2-1.0.r408473/9683 K 8 projects V 30 dir 0-377393.0.r378744/3577692 K 8 svnadmin V 22 dir 3-1.0.r407955/1655 K 4 tags V 22 dir 8-1.0.r393564/5019 END ENDREP id: 0.0.r408473/10120 type: dir pred: 0.0.r408472/48801 count: 408473 text: 408473 9897 210 0 f273948528b3ac3420abae22e617d24a props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 30 5-280009.0.t408472-8r6h modify-file true false /head/cad/openscad/Makefile _5.0.t408472-8r6h add-dir false false /head/cad/openscad/files _6.0.t408472-8r6h add-file true true /head/cad/openscad/files/patch-src_colormap.h _9.0.t408472-8r6h add-file true true /head/cad/openscad/files/patch-src_scintillaeditor.h 10120 10343