Fred Gleason 2503c69ae5 resolved conflict in ChangeLog

2016-04-26 16:44:35 -04:00

..

audio_cart.cpp

2016-03-30 Fred Gleason <fredg@paravelsystems.com>

2016-03-30 18:22:37 -04:00

audio_cart.h

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

audio_controls.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

cart_tip.cpp

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

cart_tip.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

cdripper.cpp

2015-04-07 Fred Gleason <fredg@paravelsystems.com>

2015-04-07 14:09:55 -04:00

cdripper.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

disk_gauge.cpp

2014-10-10 Fred Gleason <fredg@paravelsystems.com>

2014-10-10 11:11:06 -04:00

disk_gauge.h

2014-10-10 Fred Gleason <fredg@paravelsystems.com>

2014-10-10 11:11:06 -04:00

disk_ripper.cpp

2015-04-07 Fred Gleason <fredg@paravelsystems.com>

2015-04-07 14:09:55 -04:00

disk_ripper.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

edit_cart.cpp

2016-04-26 Fred Gleason <fredg@paravelsystems.com>

2016-04-26 15:25:52 -04:00

edit_cart.h

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

edit_macro.cpp

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

edit_macro.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

edit_notes.cpp

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

edit_notes.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

edit_schedulercodes.cpp

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

edit_schedulercodes.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

filter.cpp

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

filter.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

globals.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

lib_listview.cpp

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

lib_listview.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

list_reports.cpp

2015-03-16 Fred Gleason <fredg@paravelsystems.com>

2015-03-16 17:39:45 -04:00

list_reports.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

macro_cart.cpp

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

macro_cart.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

Makefile.am

2016-03-25 Fred Gleason <fredg@paravelsystems.com>

2016-03-25 10:30:45 -04:00

rdlibrary_cs.ts

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

rdlibrary_de.ts

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

rdlibrary_es.ts

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

rdlibrary_fr.ts

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

rdlibrary_nb.ts

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

rdlibrary_nn.ts

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

rdlibrary_pt_BR.ts

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

rdlibrary.cpp

Fix to rdlibrary.cpp to show all 100 carts in search

2016-04-21 21:56:14 -04:00

rdlibrary.h

Replace getenv("HOME") by RDGetHomeDir() in rdlibrary MainWidget::LoadGeometry/SaveGeometry. Create MainWidget::GeometryFile to share logic

2014-09-05 10:22:22 +02:00

rdlibrary.pro

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00

record_cut.cpp

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

record_cut.h

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

validate_cut.cpp

2016-03-23 Fred Gleason <fredg@paravelsystems.com>

2016-03-24 11:38:21 -04:00

validate_cut.h

Initial import of CVS-v2_8_branch

2014-08-12 15:13:02 -04:00