Removed the *.user file from the index. It doesn't belong being version tracked. Also fixed an extraneous qualifier that didn't mess up on Windows but breaks the compile on OSX.

2015-05-12 18:47:26 -04:00
parent 799d2d77f0
commit 2d989053e7
3 changed files with 2 additions and 449 deletions
@@ -16,7 +16,7 @@ public:
    QVariant data(const QModelIndex &index, int role) const;
    QVariant headerData(int section, Qt::Orientation orientation,
                        int role = Qt::DisplayRole) const;
-    int CANFrameModel::columnCount(const QModelIndex &) const;
+    int columnCount(const QModelIndex &) const;

    void addFrame(CANFrame &, bool);
    void sendRefresh();