diff options
| author | koem <koem@petoria.de> | 2013-05-01 18:28:52 -0500 |
|---|---|---|
| committer | koem <koem@petoria.de> | 2013-05-01 18:28:52 -0500 |
| commit | f7fb7e91cbfb14a473220a544e469d1a1581288f (patch) | |
| tree | 4d0d36b2196cef4eda4705775fc1bb949b9ca8db /.gitignore | |
| parent | 9eae0750719e94dab9dae6540095e19fa7b11ff9 (diff) | |
| parent | 74fce89a36e8d130851145941459966aed1176c3 (diff) | |
| download | cgeo-f7fb7e91cbfb14a473220a544e469d1a1581288f.zip cgeo-f7fb7e91cbfb14a473220a544e469d1a1581288f.tar.gz cgeo-f7fb7e91cbfb14a473220a544e469d1a1581288f.tar.bz2 | |
Merge branch 'master' into issue2662-leichtes-klettern
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -13,3 +13,4 @@ gen/ /cgeo-calendar/private.properties .directory org.moreunit.prefs +annotation_gen/ |