Back
[00:02:46] -!- zumba_addict has quit [Read error: Connection reset by peer]
[00:10:25] -!- Tecan has quit [Ping timeout: 260 seconds]
[00:22:09] <KGB-linuxcnc> 05dgarr/menu_update 52931b1 06linuxcnc 04. branch deleted * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=52931b1
[00:25:16] -!- gonzo__nb has quit [Remote host closed the connection]
[00:30:52] -!- rob_h has quit [Ping timeout: 260 seconds]
[00:38:59] -!- sylphiae has quit [Ping timeout: 272 seconds]
[00:49:15] -!- tronwizard has quit [Ping timeout: 272 seconds]
[01:01:37] -!- Tom_shop [Tom_shop!~tom@ip68-102-196-57.ks.ok.cox.net] has joined #linuxcnc-devel
[01:01:43] -!- GJdan has quit [Quit: WeeChat 1.1-dev]
[01:05:55] <KGB-linuxcnc> 03Jeff Epler 05v2.5_branch 22ed1fa 06linuxcnc Merge remote-tracking branch 'jepler/signed-off-by' into v2.5_branch * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=22ed1fa
[01:05:55] <KGB-linuxcnc> 03Jeff Epler 052.6 59f7f47 06linuxcnc Merge branch 'v2.5_branch' into 2.6 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=59f7f47
[01:05:55] <KGB-linuxcnc> 03Jeff Epler 05master bddb844 06linuxcnc Merge branch '2.6' * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=bddb844
[01:26:38] -!- rythmnbls has quit [Quit: Leaving]
[01:37:24] -!- Tom_shop has quit [Quit: Leaving]
[01:40:32] -!- atom1 [atom1!~tom@ip68-102-196-57.ks.ok.cox.net] has joined #linuxcnc-devel
[01:40:32] -!- atom1 has quit [Changing host]
[01:40:32] -!- atom1 [atom1!~tom@unaffiliated/toml/x-013812] has joined #linuxcnc-devel
[01:49:40] -!- skunkworks [skunkworks!~chatzilla@str-broadband-ccmts-ws-26.dsl.airstreamcomm.net] has joined #linuxcnc-devel
[01:56:30] -!- nofxx has quit [Remote host closed the connection]
[02:02:08] -!- atom1 has quit [Quit: Leaving]
[02:05:33] -!- Tom_shop [Tom_shop!~tom@ip68-102-196-57.ks.ok.cox.net] has joined #linuxcnc-devel
[02:08:40] -!- ktchk [ktchk!~eddie6929@n219073004083.netvigator.com] has joined #linuxcnc-devel
[02:25:26] -!- Thetawaves has quit [Quit: This computer has gone to sleep]
[02:29:22] <seb_kuzminsky> very cool, jepler
[02:30:25] -!- sirdancealot has quit [Ping timeout: 260 seconds]
[02:35:37] -!- barbs_ has quit [Quit: Leaving]
[02:35:38] -!- scooty_puff has quit [Quit: Leaving]
[02:40:35] -!- amiri has quit [Ping timeout: 272 seconds]
[02:47:13] -!- JLuc69_ has quit [Ping timeout: 260 seconds]
[02:54:27] -!- AR_ has quit [Ping timeout: 245 seconds]
[03:09:30] -!- BellinganRoy has quit [Quit: Konversation terminated!]
[03:11:43] <cradek> I'm back to civilization now
[03:11:51] <cradek> yay we have a SOB policy
[03:12:02] <cradek> thanks archivist for doing the dirty work
[03:12:19] <skunkworks> where did you guys go?
[03:12:51] <cradek> a political rally cleverly disguised as a concert
[03:13:09] <cradek> well that's where I went
[03:13:13] <skunkworks> cool :)
[03:13:28] <cradek> I'd've been happier with just a nice concert
[03:13:37] <cradek> but it was fun anyway
[03:13:44] <skunkworks> That is good.
[03:22:03] -!- PetefromTn_ has quit [Quit: I'm Outta here!!]
[03:31:57] -!- skors has quit [Ping timeout: 245 seconds]
[03:33:28] -!- Tom_shop has quit [Quit: Leaving]
[03:36:04] -!- atom1 [atom1!~tom@unaffiliated/toml/x-013812] has joined #linuxcnc-devel
[03:41:53] -!- anarchos2 has quit [Read error: Connection reset by peer]
[03:52:51] -!- jerryitt has quit [Quit: Connection closed for inactivity]
[03:56:09] -!- mhaberler has quit [Quit: mhaberler]
[03:56:44] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/menu_updatev2 5a9db7d 06linuxcnc 10(8 files in 5 dirs) Application menu fixes * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=5a9db7d
[03:57:26] -!- Connor_iPad has quit [Client Quit]
[03:57:38] -!- ktchk has quit [Quit: ktchk]
[03:57:55] -!- atom1 has quit [Quit: Leaving]
[03:59:56] -!- phantoxeD has quit [Ping timeout: 260 seconds]
[04:00:49] -!- Tom_shop [Tom_shop!~tom@ip68-102-196-57.ks.ok.cox.net] has joined #linuxcnc-devel
[04:12:39] -!- sumpfralle has quit [Read error: Connection reset by peer]
[04:30:01] -!- kwallace2 [kwallace2!~kwallace@smb-123.sonnet.com] has parted #linuxcnc-devel
[04:31:19] -!- Tecan has quit [Remote host closed the connection]
[04:32:51] -!- Tecan has quit [Changing host]
[04:45:21] -!- Fox_Muldr has quit [Ping timeout: 272 seconds]
[04:48:18] -!- piccata has quit [Remote host closed the connection]
[05:01:19] -!- Tom_shop has quit [Quit: Leaving]
[05:07:19] -!- ve7it has quit [Remote host closed the connection]
[05:21:07] -!- Lathe_newbie has quit [Ping timeout: 245 seconds]
[05:31:59] -!- asah has quit [Quit: asah]
[06:01:04] -!- PetefromTn_andro has quit [Quit: Bye]
[06:05:01] -!- kwallace [kwallace!~kwallace@tmb-234.sonnet.com] has joined #linuxcnc-devel
[06:05:37] -!- kwallace [kwallace!~kwallace@tmb-234.sonnet.com] has parted #linuxcnc-devel
[06:13:29] <KGB-linuxcnc> 03Chris Morley 05master 54d3c5b 06linuxcnc 10(5 files in 2 dirs) docs -add some info on Gscreen custom screens * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=54d3c5b
[06:29:32] -!- BellinganRoy has quit [Quit: Konversation terminated!]
[06:32:31] -!- MacGalempsy has quit [Ping timeout: 272 seconds]
[06:41:08] -!- zeitue has quit [Ping timeout: 250 seconds]
[06:42:26] -!- rob_h [rob_h!~robh@2.223.235.128] has joined #linuxcnc-devel
[07:18:58] <linuxcnc-build> build #651 of 1405.rip-wheezy-armhf is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1405.rip-wheezy-armhf/builds/651 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:29:02] -!- sumpfralle1 has quit [Ping timeout: 245 seconds]
[07:33:09] <linuxcnc-build> build #2464 of 1200.rip-lucid-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1200.rip-lucid-i386/builds/2464 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:39:46] <linuxcnc-build> build #2463 of 1300.rip-precise-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1300.rip-precise-i386/builds/2463 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:40:12] <linuxcnc-build> build #2465 of 1306.rip-precise-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1306.rip-precise-amd64/builds/2465 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:43:32] <linuxcnc-build> build #1665 of 1301.rip-precise-rtai-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1301.rip-precise-rtai-i386/builds/1665 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:46:16] <linuxcnc-build> build #812 of 1404.rip-wheezy-rtpreempt-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1404.rip-wheezy-rtpreempt-amd64/builds/812 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:48:13] <linuxcnc-build> build #621 of 1403.rip-wheezy-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1403.rip-wheezy-amd64/builds/621 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:48:47] <linuxcnc-build> build #132 of 1402.rip-wheezy-rtpreempt-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1402.rip-wheezy-rtpreempt-i386/builds/132 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:50:10] <linuxcnc-build> build #621 of 1400.rip-wheezy-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1400.rip-wheezy-i386/builds/621 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:51:21] -!- micges [micges!~micges@aeid170.neoplus.adsl.tpnet.pl] has joined #linuxcnc-devel
[07:52:00] <linuxcnc-build> build #278 of 1401.rip-wheezy-rtai-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1401.rip-wheezy-rtai-i386/builds/278 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:56:59] <linuxcnc-build> build #2464 of 1202.rip-lucid-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1202.rip-lucid-amd64/builds/2464 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:57:22] <linuxcnc-build> build #2464 of 1201.rip-lucid-rtai-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1201.rip-lucid-rtai-i386/builds/2464 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[07:57:22] <linuxcnc-build> build #2472 of 0000.checkin is complete: Failure [4failed] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/0000.checkin/builds/2472 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[08:04:29] Cylly is now known as Loetmichel
[08:05:52] -!- karavanjo has quit [Ping timeout: 240 seconds]
[08:32:09] -!- tronwizard has quit [Ping timeout: 246 seconds]
[09:04:55] -!- mhaberler has quit [Client Quit]
[09:28:39] -!- mahtennek has quit []
[09:35:12] -!- ITChap has quit [Quit: Leaving.]
[09:41:58] -!- balestrino has quit [Ping timeout: 244 seconds]
[09:44:18] -!- ITChap has quit [Quit: Leaving.]
[09:56:28] -!- grummund has quit [Ping timeout: 260 seconds]
[10:00:07] -!- Tecan has quit [Quit: Live Long And Phosphor!]
[10:03:25] -!- f1oat [f1oat!~f1oat@AMontsouris-553-1-63-27.w92-151.abo.wanadoo.fr] has joined #linuxcnc-devel
[10:05:20] -!- balestrino has quit [Ping timeout: 260 seconds]
[10:07:17] -!- _balestrino has quit [Ping timeout: 260 seconds]
[10:08:16] -!- f1oat has quit [Client Quit]
[10:37:12] -!- b_b has quit [Changing host]
[10:38:05] -!- JLuc69__ has quit [Ping timeout: 260 seconds]
[11:08:15] -!- Lathe_newbie has quit [Ping timeout: 244 seconds]
[11:10:17] -!- JLuc69 has quit [Ping timeout: 260 seconds]
[11:58:44] -!- Lathe_newbie has quit [Ping timeout: 260 seconds]
[12:36:49] -!- __unik [__unik!~unik@113.190.56.170] has joined #linuxcnc-devel
[12:40:32] -!- _nexxus_ has quit [Quit: Leaving.]
[12:42:18] <jepler> actual error seems to be
[12:42:19] <jepler> make: *** No rule to make target `objects/gui/gscreen.links', needed by `objects/xref_en.links'. Stop.
[12:42:23] <jepler> make: *** Waiting for unfinished jobs....
[12:44:04] <jepler> it looks like the file gscreen.txt wasn't even added to git
[12:44:53] -!- ibaca has quit [Read error: Connection reset by peer]
[13:28:32] -!- tronwzrd has quit [Ping timeout: 245 seconds]
[13:29:28] -!- storrgie has quit [Remote host closed the connection]
[13:39:30] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/menu_updatev2 fd532fc 06linuxcnc 10scripts/latency-histogram 10scripts/latency-plot app scripts: prepend auto_path (RIP, gui usage) * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=fd532fc
[13:42:44] -!- Thetawaves has quit [Quit: This computer has gone to sleep]
[13:50:12] -!- H3XIL3D has quit [Ping timeout: 245 seconds]
[13:50:20] -!- HeXiLeD has quit [Changing host]
[14:06:06] -!- kwallace [kwallace!~kwallace@tmb-234.sonnet.com] has joined #linuxcnc-devel
[14:22:21] -!- HeXiLeD has quit [Remote host closed the connection]
[14:24:24] -!- PetefromTn_andro has quit [Quit: Bye]
[14:40:36] -!- balestrino has quit [Ping timeout: 244 seconds]
[14:52:22] Fox_M|afk is now known as Fox_Muldr
[14:58:51] -!- kwallace2 [kwallace2!~kwallace@smb-113.sonnet.com] has joined #linuxcnc-devel
[15:00:35] -!- kwallace has quit [Ping timeout: 258 seconds]
[15:11:03] arkgis is now known as knutole
[15:19:41] <KGB-linuxcnc> 03Chris Morley 05master 78734d0 06linuxcnc 03docs/src/gui/gscreen.txt docs - oops forget screens text writeup file * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=78734d0
[15:24:06] -!- skors has quit [Ping timeout: 246 seconds]
[15:24:45] -!- AndChat|144384 has quit [Ping timeout: 272 seconds]
[15:34:41] phantoneD is now known as phantoxeD
[15:47:51] -!- miss0r has quit []
[15:47:52] -!- balestrino has quit [Ping timeout: 260 seconds]
[15:47:55] -!- syyl has quit [Ping timeout: 246 seconds]
[15:57:08] -!- ibaca has quit [Quit: Bye.]
[16:01:58] -!- PetefromTn_ has quit [Quit: I'm Outta here!!]
[16:03:23] -!- amiri_ has quit [Ping timeout: 272 seconds]
[16:09:39] -!- __unik has quit [Read error: Connection reset by peer]
[16:10:02] -!- ITChap has quit [Quit: Leaving.]
[16:20:06] -!- jfrmilner has quit [Ping timeout: 246 seconds]
[16:20:06] jfrmilner_ is now known as jfrmilner
[16:21:00] -!- mhaberler has quit [Quit: mhaberler]
[16:21:00] <cradek> cmorley: wow, thanks for doing gscreen docs, that's wonderful
[16:21:29] <cmorley> Ya sorry about the missing commit :)
[16:21:39] <cradek> eh
[16:22:00] <cradek> nobody's ever forgotten to add a file before -- you're the first
[16:22:20] <cradek> in the whole history of the world
[16:22:26] <cradek> what are the chances!?
[16:23:16] <cmorley> lol
[16:23:29] <cradek> argh, I should move the mill over there <--, so I can put the microscope over there -->
[16:23:42] <cradek> but that seems so hard to do
[16:23:45] * archivist does not believe
[16:23:58] <cradek> mostly because the desk over there <-- is covered with half-finished crap
[16:24:10] <archivist> microscope need to be all over the place
[16:25:03] <archivist> I have one over the lorch 65mm lathe and one over the watchmakers lathe
[16:25:04] <cradek> for me it should really be right next to the watch/jeweler's desk
[16:25:20] <cradek> instead of as far away from it as possible
[16:25:38] <archivist> I have one on a stand that gets moved
[16:26:17] <archivist> I have one I need to mount up yet
[16:26:34] <cradek> I have one good one and one that's crap
[16:26:46] <cradek> I really don't want to buy more good ones
[16:27:08] <archivist> if b&l I found how to adjust on the net
[16:27:17] <cradek> the variable power stereo is sooo nice
[16:28:15] <archivist> yes and getting one right is here
http://www.covingtoninnovations.com/stereozoom/
[16:29:06] <archivist> best £50 I ever spent getting my first one
[16:30:26] <Tom_itx> 3x zoom?
[16:30:52] <archivist> .7 to 3 X zoom
[16:31:30] <archivist> that and the default 10x eyepieces makes them wonderful
[16:31:47] <Tom_itx> i use a 7x45 for electronics
[16:32:47] -!- sylphiae has quit [Ping timeout: 245 seconds]
[16:33:42] <Tom_itx> similar range with your eyepiece
[16:33:50] <archivist> I have been searching today for the thread spec of the two holes for an illuminater mount (near the slots that hold in in the rectangle)
[16:33:54] <pcw_home> http://blog.modernmechanix.com/eye-glasses-double-for-microscope/
[16:33:55] <cradek> mine is 20*.7 to 20*4.5 zoom
[16:35:20] <cradek> pcw_home: pinholes?
[16:35:28] <pcw_home> Yeah
[16:36:25] <pcw_home> I have a old Zeiss binocular with 4 magnification steps (not sure what they are off hand)
[16:41:27] -!- kwallace2 has quit [Ping timeout: 245 seconds]
[16:41:52] -!- balestrino has quit [Ping timeout: 245 seconds]
[16:47:18] <archivist> so I thought I got a good encoder test... but the right hand blank still shows a helix
http://www.collection.archivist.info/archive/DJCPD/PD/2014/2014_09_28_Ford_speedo_gears/IMG_1836.JPG
[16:48:10] <archivist> good enough to get a couple out the door methinks
[16:51:10] -!- kwallace [kwallace!~kwallace@smb-47.sonnet.com] has joined #linuxcnc-devel
[16:52:38] <Tom_itx> delrin?
[16:54:03] -!- Tecan has quit [Changing host]
[16:54:16] <archivist> acetal, near enough the same I think
[16:54:51] -!- Spyou has quit [Quit: Coyote finally caught me]
[16:56:00] <Tom_itx> are the 'cutter' and 'stepper' dials to make sure they stay in sync?
[16:56:48] <archivist> to show what rate, so both run in the green area so it is withing the period
[17:12:59] -!- Felix29 [Felix29!~coors@c-67-166-12-95.hsd1.co.comcast.net] has joined #linuxcnc-devel
[17:24:43] <kwallace> A bit off topic, but it is fairly quiet. If one has computers behind a router that translates the PCs addresses to one address, no one from outside can see the individual PCs?
[17:25:18] <Tom_itx> true
[17:25:23] <Tom_itx> all they see is the router
[17:25:48] <Tom_itx> or the first pc in line
[17:25:57] <archivist> unless you set routes
[17:26:10] <Tom_itx> or that
[17:28:07] <kwallace> My ISP router checked okay for the Shellshocked bug, but one of my PCs looks like it had a big download in the middle of the night, SNMP doesn't work and I can't sudo. This PC was vulnerable, but I checked it too late.
[17:29:26] <kwallace> I'm not sure if a hacker could get to it if the router wasn't vulnerable.
[17:31:50] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/menu_updatev2 7dd6549 06linuxcnc 10configs/apps/info.txt 10scripts/linuxcnc_info linuxcnc_info: incorporate editor search * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=7dd6549
[17:36:32] -!- skunkworks has quit [Ping timeout: 245 seconds]
[17:36:58] -!- nofxx has quit [Remote host closed the connection]
[17:37:48] -!- tjtr33 has quit [Quit: Leaving]
[17:40:52] -!- balestrino has quit [Ping timeout: 240 seconds]
[17:46:01] -!- nofxx has quit [Changing host]
[17:53:48] <kwallace> Oops, my PC is fine, sudo and SNMP works. I just forgot how to use them. It handles my traffic graphing and local FTP and I haven't needed to touch it for a long time.
[17:53:49] -!- skunkworks_ [skunkworks_!~chatzilla@str-broadband-ccmts-ws-26.dsl.airstreamcomm.net] has joined #linuxcnc-devel
[18:01:33] -!- norbert [norbert!~norbert@a89-182-89-34.net-htp.de] has joined #linuxcnc-devel
[18:02:13] norbert is now known as Guest16806
[18:02:46] Guest16806 is now known as norbert_
[18:02:52] norbert_ is now known as norbert__
[18:04:42] <norbert__> Hallo, I made a lot of changes and additions do docs, mostly related to gmoccapy. I just wanted to push to 2.6, but I am afraid, because I took notice, that Chris Morley just pushed changes to the same files to master. Do I destroy the somethink, if I do push my changes to 2.6, while Chris did push to master?
[18:07:58] <cmorley> norbert__ it will then most likely need to be hand merged when 2.6 is merged to master.
[18:08:25] <cmorley> you can do that on your local machine then push to master.
[18:08:45] <norbert__> Ok, then I will pull your files, add the changes to my push, is that OK?
[18:09:18] <cmorley> commit your changes to your local 2.6, switch to master (make sure its up to date) then git merge 2.6
[18:09:50] <cmorley> fix what need to be fixed then push to origin/master
[18:09:57] <norbert__> OK I will do that.
[18:11:12] <cmorley> just make sure your happy with both before you push to origin/2.6 and origin/master.
[18:11:57] <cmorley> Ig you just push your docs to origin/2.6 then the next person who merges 2.6 to master will have to do the hand merging part.
[18:12:32] <cmorley> probably that was clear as mud.... hope you can figure it out :)
[18:12:54] <norbert__> That is what I wanted to avoid, I am not the person to bring problems to other, if I am able to avoid
[18:13:30] <jepler> following the process cmorley recommends is best for others.
[18:14:29] -!- syyl_ has quit [Ping timeout: 272 seconds]
[18:18:26] <norbert__> Did the merge, all seem to be OK. I am at the moment doing make docs to be sure I didn't loose anythink
[18:21:32] <cmorley> Oh a clean merge is nice!
[18:22:16] <norbert__> One more question, while my computer is working, how do we get the documents to 2.6, after I pushed the merge to master? Can someone do a chery pick?
[18:23:00] <cmorley> norbert__ did you commit your changes to your local 2.6 first?
[18:23:08] <norbert__> yes
[18:23:28] <cmorley> then you will push your local 2.6 to origin/2.6
[18:23:59] <cmorley> then you merged your local 2.6 (that has your changes) to your local master?
[18:24:15] <norbert__> If I should do that, I will do so, but don't we get problems later if someone tries to merge 2.6 to master?
[18:24:42] <norbert__> O I did merge allready my 2.6 to my master
[18:24:58] <cmorley> you got it ! you just did the merge
[18:25:11] <norbert__> but I didn#t push to origuing 2.6 jet
[18:25:49] -!- Reventlov has quit [Remote host closed the connection]
[18:26:03] <cmorley> so if you are happy with both - then push to local 2.6 to origin/2.6 then push local/master to origin/master
[18:26:36] <norbert__> OK, but need some time to finish make docs ;-)
[18:26:42] <cmorley> sorry push local/2.6 to origin/2.6, local/master to origin/master
[18:27:02] <norbert__> I will do so
[18:27:08] <cmorley> checking that if compile properly ?
[18:27:43] <norbert__> Yes, I check that, till now no errors
[18:27:52] -!- bedah has quit [Quit: afk]
[18:28:53] <cmorley> the only other thing to check is that you commited all the relevant files. last night i forgot to commit a file - so it compiled properly on my computer but of course failed on linuxcnc buildbot :)
[18:29:34] <norbert__> I am pretty sure I included all files.
[18:29:54] <cmorley> all good then
[18:38:24] -!- reventlov has quit [Changing host]
[18:38:45] -!- reventlov has quit [Client Quit]
[18:39:06] -!- Lathe_newbie has quit [Remote host closed the connection]
[18:39:50] <KGB-linuxcnc> 03Norbert Schechner 052.6 db713b6 06linuxcnc 10(33 files in 6 dirs) docs - added gmoccapy documentation and update info to 2.6 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=db713b6
[18:40:52] <KGB-linuxcnc> 03Norbert Schechner 05master be0588e 06linuxcnc 10docs/src/Submakefile 10docs/src/common/Glossary.txt 10docs/src/config/ini_config.txt 10docs/src/index.tmpl Merge branch '2.6' * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=be0588e
[18:43:56] <norbert__> Juhu, as far as I can see it, all went well ;-)
[18:45:48] <norbert__> Ok, I am going to sleep.
[18:45:58] -!- norbert__ has quit [Quit: Konversation terminated!]
[18:48:55] <KGB-linuxcnc> 03Jeff Epler 05master 73e1285 06linuxcnc Merge remote-tracking branch 'origin/2.6' * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=73e1285
[18:49:14] <jepler> it's not quite right, but I merged 2.6 to master and didn't encounter any conflicts or other errors.
[18:49:32] <jepler> thanks for trying, we'll continue helping you to become more comfortable with git.
[19:07:35] -!- ve7it [ve7it!~LawrenceG@S01060014d19d0b68.pk.shawcable.net] has joined #linuxcnc-devel
[19:21:37] -!- sirdancealot has quit [Ping timeout: 272 seconds]
[19:26:52] -!- f1oat [f1oat!~f1oat@AMontsouris-553-1-63-27.w92-151.abo.wanadoo.fr] has joined #linuxcnc-devel
[20:18:23] -!- micges has quit [Quit: Ex-Chat]
[20:20:27] -!- micges-dev [micges-dev!~x@aeid170.neoplus.adsl.tpnet.pl] has joined #linuxcnc-devel
[20:31:15] -!- BellinganRoy has quit [Quit: Konversation terminated!]
[20:32:51] -!- jerryitt has quit [Quit: Connection closed for inactivity]
[20:40:12] -!- Loetmichel has quit [Ping timeout: 245 seconds]
[20:48:52] -!- sumpfralle has quit [Ping timeout: 260 seconds]
[20:55:42] -!- f1oat has quit [Ping timeout: 244 seconds]
[21:27:45] -!- skunksleep has quit [Ping timeout: 246 seconds]
[21:29:11] -!- dnaleromj has quit []
[21:29:53] -!- Deejay has quit [Quit: bye]
[21:36:49] -!- chillly has quit [Quit: Ex-Chat]
[21:43:05] -!- balestrino has quit [Ping timeout: 258 seconds]
[22:02:08] -!- syyl has quit [Ping timeout: 260 seconds]
[22:04:27] -!- nofxx has quit [Ping timeout: 245 seconds]
[22:11:28] -!- micges-dev has quit [Quit: Wychodzi]
[22:12:41] -!- karavanjo_ has quit [Read error: Connection reset by peer]
[22:13:45] -!- MacGalempsy_ has quit [Remote host closed the connection]
[22:23:23] -!- kfoltman has quit [Quit: Ex-Chat]
[22:25:09] -!- kengu has quit [Ping timeout: 246 seconds]
[22:35:05] -!- Thetawaves has quit [Quit: This computer has gone to sleep]
[22:43:39] -!- Tecan has quit [Ping timeout: 258 seconds]
[23:07:17] -!- rythmnbls has quit [Quit: Leaving]
[23:12:41] amnesic_away is now known as amnesic
[23:13:37] -!- moorbo has quit [Ping timeout: 260 seconds]
[23:13:42] amnesic is now known as amnesic_away
[23:16:40] -!- PetefromTn_ has quit [Quit: I'm Outta here!!]
[23:36:22] -!- asdfasd has quit [Ping timeout: 240 seconds]
[23:40:17] -!- AR_ has quit [Ping timeout: 245 seconds]
[23:49:12] -!- knutole has quit [Remote host closed the connection]
[23:59:57] -!- rob_h has quit [Ping timeout: 272 seconds]
