Richard Shaw
|
2e5521b35e
|
Merge branch 'master' into f23
|
2016-12-12 14:07:07 -06:00 |
|
Richard Shaw
|
519d79d2a9
|
Merge branch 'master' into f23
|
2016-11-13 12:06:40 -06:00 |
|
Richard M. Shaw
|
8ab75ce512
|
Merge branch 'master' into f23
|
2016-10-17 10:00:31 -05:00 |
|
Richard M. Shaw
|
b0323e0713
|
Merge branch 'master' into f23
|
2016-10-05 08:59:55 -05:00 |
|
Richard M. Shaw
|
a95ed03491
|
Merge branch 'master' into f23
|
2016-06-29 14:03:07 -05:00 |
|
Richard M. Shaw
|
1869e54342
|
Merge branch 'master' into f23
|
2016-05-31 13:29:51 -05:00 |
|
Richard M. Shaw
|
234046221c
|
Merge branch 'master' into f23
|
2016-04-03 15:42:57 -05:00 |
|
Richard M. Shaw
|
ea64136db5
|
Merge branch 'master' into f23
|
2016-02-25 10:40:01 -06:00 |
|
Richard M. Shaw
|
9f06057d7c
|
Merge branch 'master' into f23
|
2016-01-22 12:01:29 -06:00 |
|
Richard M. Shaw
|
586b85d24e
|
Merge branch 'master' into f23
|
2015-12-04 15:55:31 -06:00 |
|
Richard M. Shaw
|
23fe0a1485
|
Merge branch 'master' into f23
|
2015-11-23 22:25:27 -06:00 |
|
Richard M. Shaw
|
fe04905dd2
|
Merge branch 'master' into f23
|
2015-10-16 08:42:17 -05:00 |
|
Richard M. Shaw
|
c40d4b0d2d
|
Fix merge conflicts.
|
2015-09-30 16:11:06 -05:00 |
Richard Hughes
|
ebc4a174f0
|
Remove now-unused flarq.appdata.xml file
We require an AppData file for the software center, so there's no need to merge
applications that only have .desktop files.
|
2015-09-18 14:27:19 +01:00 |