summaryrefslogtreecommitdiff
path: root/src/wx/job_manager_view.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-10-03 09:14:58 +0100
committerCarl Hetherington <cth@carlh.net>2016-10-03 09:14:58 +0100
commit1fb11836b91977a949bef5eae807d57b13fe9bf8 (patch)
tree2a9ebae3c5cd7b8fdec2d718be98a7d4c15e2215 /src/wx/job_manager_view.h
parent1b7e04a8628bf7eff1c58d1db05ecd89ac3f664d (diff)
Fix various bad automatic merges in i18n files.
Diffstat (limited to 'src/wx/job_manager_view.h')
-rw-r--r--src/wx/job_manager_view.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index d887718d3..7784c71ee 100644
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -35,7 +35,7 @@ class JobView;
class JobManagerView : public wxScrolledWindow
{
public:
- JobManagerView (wxWindow *, bool latest_at_top);
+ JobManagerView (wxWindow *, bool batch);
private:
void job_added (boost::weak_ptr<Job>);
@@ -44,7 +44,7 @@ private:
wxPanel* _panel;
wxFlexGridSizer* _table;
boost::shared_ptr<wxTimer> _timer;
- bool _latest_at_top;
+ bool _batch;
std::list<boost::shared_ptr<JobView> > _job_records;
};