diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2014-08-31 18:53:31 -0400 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2014-08-31 21:18:56 -0400 |
| commit | 8af536f7d95d99e182d8bb072e7f8ffbaedb585e (patch) | |
| tree | 52fdb43cb1997d42f3ef0b1cc80b3dca2f11bcfe /apps/plugins/CATEGORIES | |
| parent | 304c28c13c849bd8df81cfaf7cfc594b0f32a5f5 (diff) | |
| download | rockbox-8af536f7d95d99e182d8bb072e7f8ffbaedb585e.zip rockbox-8af536f7d95d99e182d8bb072e7f8ffbaedb585e.tar.gz rockbox-8af536f7d95d99e182d8bb072e7f8ffbaedb585e.tar.bz2 rockbox-8af536f7d95d99e182d8bb072e7f8ffbaedb585e.tar.xz | |
Fixed conflict
Change-Id: Ie5ff414d78bdd1d141d5c34b26e13d4576286ecd
Diffstat (limited to 'apps/plugins/CATEGORIES')
| -rw-r--r-- | apps/plugins/CATEGORIES | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/plugins/CATEGORIES b/apps/plugins/CATEGORIES index 626dca0..0fd3b1a 100644 --- a/apps/plugins/CATEGORIES +++ b/apps/plugins/CATEGORIES @@ -1,6 +1,7 @@ 2048,games alpine_cdc,apps alarmclock,apps +annoyatron,apps autostart,apps battery_bench,apps bench_scaler,apps |