From 8af536f7d95d99e182d8bb072e7f8ffbaedb585e Mon Sep 17 00:00:00 2001
From: Franklin Wei <frankhwei536@gmail.com>
Date: Sun, 31 Aug 2014 18:53:31 -0400
Subject: Fixed conflict

Change-Id: Ie5ff414d78bdd1d141d5c34b26e13d4576286ecd
---
 apps/plugins/CATEGORIES | 1 +
 apps/plugins/SOURCES    | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'apps/plugins')

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
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index a051e2d..14bf1ad 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -260,3 +260,6 @@ test_touchscreen.c
 #endif
 test_viewports.c
 #endif /* HAVE_TEST_PLUGINS */
+#if defined(HAVE_HARDWARE_CLICK) && !defined(SIMULATOR)
+annoyatron.c
+#endif
-- 
cgit v1.1