2014-11-28 GnuCash IRC logs
00:06:08 *** StuM has joined #gnucash
00:12:26 *** jimvideo has quit IRC
00:40:22 *** GabrieleV_ has joined #gnucash
00:40:27 *** GabrieleV has quit IRC
00:40:27 *** GabrieleV_ is now known as GabrieleV
01:17:48 *** MechtiIde has joined #gnucash
01:19:53 *** GabrieleV_ has joined #gnucash
01:20:33 *** GabrieleV has quit IRC
01:20:34 *** GabrieleV_ is now known as GabrieleV
01:34:38 *** cartsoftware has joined #gnucash
01:47:52 *** calp has quit IRC
01:49:56 *** calp has joined #gnucash
02:03:17 *** MechtiIde has quit IRC
02:13:10 *** O01eg has quit IRC
02:17:29 *** cartsoftware has quit IRC
02:21:41 *** Krzysiek_K has joined #gnucash
02:22:03 *** Krzysiek_K has left #gnucash
02:38:39 *** cartsoftware has joined #gnucash
03:19:29 *** GabrieleV_ has joined #gnucash
03:19:33 *** GabrieleV has quit IRC
03:19:34 *** GabrieleV_ is now known as GabrieleV
03:27:05 *** uXus has quit IRC
03:35:06 *** uXus has joined #gnucash
03:36:22 *** gjanssens has joined #gnucash
03:36:22 *** gncbot sets mode: +o gjanssens
03:41:13 *** [LasaK] has quit IRC
03:58:38 *** sfrique_ has quit IRC
04:59:01 *** cartsoftware has quit IRC
04:59:04 *** cartsoftware has joined #gnucash
05:41:56 *** aqua___ has joined #gnucash
06:18:15 *** cartsoftware has quit IRC
06:20:01 *** cartsoftware has joined #gnucash
07:04:29 *** Jimraehl1 has left #gnucash
07:07:52 *** Jimraehl1 has joined #gnucash
07:24:09 *** aqua___ has quit IRC
07:39:23 *** aqua___ has joined #gnucash
08:21:07 *** andy has quit IRC
08:28:08 *** andy has joined #gnucash
08:45:37 *** aqua___ has quit IRC
09:39:45 *** andy has quit IRC
09:46:02 *** andy has joined #gnucash
10:21:00 *** aqua___ has joined #gnucash
10:37:33 *** fell__ has joined #gnucash
10:37:33 *** gncbot sets mode: +o fell__
10:42:44 *** fell_ has quit IRC
10:52:54 *** wvsfxr has joined #gnucash
10:54:26 *** O01eg has joined #gnucash
10:56:06 *** wvsfxr has left #gnucash
11:17:24 *** Gbarr has quit IRC
11:26:39 *** himaxx has joined #gnucash
11:31:11 *** himaxx has quit IRC
11:31:25 *** Gbarr has joined #gnucash
11:34:08 *** aqua___ has quit IRC
11:53:20 *** ErKa has joined #gnucash
11:59:27 *** mlncn has quit IRC
12:01:12 *** MechtiIde has joined #gnucash
12:03:16 *** mlncn has joined #gnucash
12:23:36 *** fell__ is now known as fell
12:25:20 <fell> On gnucash-docs/master git merge maint fails because of the different version numbers in configure.ac
12:28:43 <fell> gjanssens, jralls
12:29:23 *** cartsoftware has quit IRC
12:42:06 <gjanssens> fell: that merge conflict will always happen after a release. You can manually resolve it.
12:42:08 <gjanssens> Do you know how ?
12:43:14 <fell> No, that's the reason, I am talking about it.
12:43:14 *** wol has joined #gnucash
12:44:15 <fell> And wiki.../Git doesn't tell it me.
12:45:46 <fell> In Eclipse I get a compare window as merge tool.
12:47:51 <fell> Should I just write the .99 again?
12:48:45 <fell> gjanssens?
12:49:26 *** mlncn has quit IRC
12:49:54 <gjanssens> fell: I never used the compare window, so I don't know what it does
12:50:18 <gjanssens> However if you open configure.ac after the merge attempt you will find conflict markers in there
12:50:25 <gjanssens> <<<<<, ===== and >>>>>
12:50:46 <gjanssens> Remove the markers and just keep the line with .99 in
12:51:15 <gjanssens> So that configure.ac looks like you would want it for master.
12:51:45 <gjanssens> Then commit
12:51:53 <fell> OK, will add a section to the wiki page.
12:52:30 <gjanssens> Thanks
13:25:44 *** GabrieleV_ has joined #gnucash
13:25:45 *** GabrieleV has quit IRC
13:25:46 *** GabrieleV_ is now known as GabrieleV
13:30:59 *** wol has quit IRC
13:31:11 *** wol has joined #gnucash
13:51:15 *** wol has quit IRC
13:56:35 *** Krzysiek_K has joined #gnucash
14:05:23 *** DimStar has quit IRC
14:07:23 *** ErKa has quit IRC
14:15:12 *** aqua___ has joined #gnucash
14:18:48 *** warlord has joined #gnucash
14:18:49 *** gncbot sets mode: +o warlord
14:35:29 *** MechtiIde has quit IRC
14:47:48 *** mlncn has joined #gnucash
14:54:13 *** aqua___ has quit IRC
15:00:36 *** jralls has quit IRC
15:01:11 *** aqua___ has joined #gnucash
15:01:14 *** jralls has joined #gnucash
15:01:14 *** gncbot sets mode: +o jralls
15:29:27 *** mlncn has quit IRC
15:42:51 *** jimvideo has joined #gnucash
15:44:04 *** andy has quit IRC
15:59:36 *** andy has joined #gnucash
16:28:24 *** ErKa has joined #gnucash
16:32:37 *** cartsoftware has joined #gnucash
16:51:45 *** fell_ has joined #gnucash
16:51:45 *** gncbot sets mode: +o fell_
16:59:08 *** fell__ has joined #gnucash
16:59:10 *** gncbot sets mode: +o fell__
17:00:41 *** fell has quit IRC
17:02:08 *** fell_ has quit IRC
17:19:09 *** cartsoftware has quit IRC
17:21:38 *** ErKa has quit IRC
17:29:50 *** mlncn has joined #gnucash
17:50:25 *** aqua___ has quit IRC
18:00:38 *** gjanssens has quit IRC
18:21:14 *** GabrieleV_ has joined #gnucash
18:21:21 *** GabrieleV has quit IRC
18:21:22 *** GabrieleV_ is now known as GabrieleV
18:32:09 *** Krzysiek_K has left #gnucash
18:36:15 *** GabrieleV_ has joined #gnucash
18:36:21 *** GabrieleV has quit IRC
18:36:22 *** GabrieleV_ is now known as GabrieleV
18:42:09 *** cartsoftware has joined #gnucash
19:03:53 *** ErKa has joined #gnucash
19:04:42 *** andy has quit IRC
19:11:48 *** andy has joined #gnucash
19:31:14 *** fell__ has quit IRC
19:32:49 *** cartsoftware1 has joined #gnucash
19:37:53 *** cartsoftware has quit IRC
19:46:04 *** jralls has quit IRC
19:46:57 *** jralls has joined #gnucash
19:46:57 *** gncbot sets mode: +o jralls
20:12:31 *** ErKa has quit IRC
20:24:44 *** cartsoftware1 has quit IRC
23:40:21 *** Gbarr has quit IRC