summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Neves2012-01-25 18:22:31 +0100
committerMichael Neves2012-01-25 18:22:31 +0100
commit6b1eebad28870e6eef578782bac394f83c279c24 (patch)
treec2f14f3f4f5449a24bb93871310ea07f70aecf9b /.gitignore
parenttestApp custom (diff)
parentdebug console fixed, now basicly tail on logfile (diff)
downloadfbgui-6b1eebad28870e6eef578782bac394f83c279c24.tar.gz
fbgui-6b1eebad28870e6eef578782bac394f83c279c24.tar.xz
fbgui-6b1eebad28870e6eef578782bac394f83c279c24.zip
Merge branch 'master' of git.openslx.org:openslx-ng/fbgui
Conflicts: testApp.sh
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 12331fb..ee34bb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ Debug
/doxygen/html/*
/doxygen/latex/*
/doxygen/man/*
+testApp.sh