Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@ghunt-desktop.(none)>2010-06-07 07:53:58 (GMT)
committer root <root@ghunt-desktop.(none)>2010-06-07 07:53:58 (GMT)
commit1c910a6a53ee169e2792588049e2d1be7115a082 (patch)
tree5469e68eb1cf8ec1316ce4509ba304221aed047c
parent4efb22e3b39d3df3a0066c4567383c308d25d480 (diff)
parent5b9ab27e1a4b1f5b0983da6a9e6305b750d5c37e (diff)
Merge branch 'master' of gitorious@git.sugarlabs.org:xophoto/mainline
-rw-r--r--test.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000..aa20643
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+Hello, George