Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-06-22 10:26:22 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-06-22 10:26:22 (GMT)
commitd165a5bcbc407a8c0ac16ad45bb5416b6671d113 (patch)
treeb6c99e66062bbd680cfc1161e845e21ff9c8b556
parent609eeab10819927de23a48952b776a586d4b8525 (diff)
Build browse activity
-rw-r--r--.gitmodules3
-rw-r--r--Makefile1
-rw-r--r--TODO1
m---------activities/browse0
4 files changed, 4 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index c9e9caa..2c80d0a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "activities/terminal"]
path = activities/terminal
url = git://git.sugarlabs.org/terminal/mainline.git
+[submodule "activities/browse"]
+ path = activities/browse
+ url = git://git.sugarlabs.org/browse/mainline.git
diff --git a/Makefile b/Makefile
index 9747192..ec07682 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ install-jhbuild: submodules check-system
build-activities: submodules
$(LOG) "$(JHBUILD) run $(SCRIPTS)/build-activity terminal" $(LOGFILE)
+ $(LOG) "$(JHBUILD) run $(SCRIPTS)/build-activity browse" $(LOGFILE)
build-glucose: install-jhbuild check-system
$(TYPESCRIPT) "$(JHBUILD) build" $(LOGFILE)
diff --git a/TODO b/TODO
index a34388f..e69de29 100644
--- a/TODO
+++ b/TODO
@@ -1 +0,0 @@
-* Build web activity
diff --git a/activities/browse b/activities/browse
new file mode 160000
+Subproject ba233cf653a7b6b801bfdfb42aebe3723c1e567