changeset 2402:07941e287663

Merge branch 'stable'
author Tony Theodore <tonyt@logyst.com>
date Sun, 15 Apr 2012 19:17:10 +1000
parents 295e88579d64 (current diff) 25844252c1c0 (diff)
children f30f0ad9cc06
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.gitignore	Sun Apr 08 16:13:59 2012 +0200
+++ b/.gitignore	Sun Apr 15 19:17:10 2012 +1000
@@ -1,5 +1,5 @@
 usr/
 log/
-pkg/
+pkg
 dist/
 wip/