diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-03-08 18:40:24 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-03-08 18:40:59 -0800 |
| commit | 7e73377e7bf982ebbfb264a42094324fa6cc1322 (patch) | |
| tree | cd84663183ca69e12326336c5037e1da5ebc8719 /grc/gui/PropsDialog.py | |
| parent | 5568d1e1ca12f0d002541b8cbb68ac558e826a47 (diff) | |
| parent | a68603099075611d0824c989fc8d8a95f5a42d76 (diff) | |
Merge branch 'maint'
Use merge strategy -s ours to skip release commit on maint.
Diffstat (limited to 'grc/gui/PropsDialog.py')
0 files changed, 0 insertions, 0 deletions