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-09 14:23:22 (GMT)
committer root <root@ghunt-desktop.(none)>2010-06-09 14:23:22 (GMT)
commit9d6532ee816a8d7ee51de06293f379125bec5c59 (patch)
tree9370b3df023b45d523cdbad682d8b150a55b665e
parent3dd64e23f215a7388982cf8560d58d1fdb4ae4ed (diff)
parent4710565896e63e48b6fd948cd14445c56cd97f2a (diff)
Merge branch 'master' of gitorious@git.sugarlabs.org:xophoto/mainline
-rw-r--r--test.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/test.txt b/test.txt
deleted file mode 100644
index aa20643..0000000
--- a/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello, George