diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 11:16:54 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 11:16:54 +0200 |
| commit | 1248e901aaf4fdb720b3fa201574aa24df4d4524 (patch) | |
| tree | 7173b34e1f68a5338b8c0c1ad8c5d33a805bbdbf /pose-widget | |
| parent | 65966c1497cbcf2c9556a754ab4e1ddef5957cfb (diff) | |
| parent | 9cc86cf3569ef6e68c4779ee0d96d1ae4ef77ca6 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'pose-widget')
| -rw-r--r-- | pose-widget/glwidget.cpp | 2 | ||||
| -rw-r--r-- | pose-widget/glwidget.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pose-widget/glwidget.cpp b/pose-widget/glwidget.cpp index ed4560af..8fbe046e 100644 --- a/pose-widget/glwidget.cpp +++ b/pose-widget/glwidget.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Stanislaw Halik <sthalik@misaki.pl> +/* Copyright (c) 2013, 2015 Stanislaw Halik <sthalik@misaki.pl> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/pose-widget/glwidget.h b/pose-widget/glwidget.h index f54ae48d..88961fbd 100644 --- a/pose-widget/glwidget.h +++ b/pose-widget/glwidget.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Stanislaw Halik <sthalik@misaki.pl> +/* Copyright (c) 2013, 2015 Stanislaw Halik <sthalik@misaki.pl> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above |