summaryrefslogtreecommitdiffstats
path: root/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-04-21 19:36:02 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-04-21 19:36:02 (GMT)
commit7eb5c8a2169ff8f58a0c0d49a751271cd62a4276 (patch)
treeaa70abd93d86bfb1d789d73f99fe60cca3cca671 /build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686
parent4349f45825efe32dfdc97e9d0bc0c841d9c9215e (diff)
parent93b7418f2782633d93661e6b67fe0766b328a7c7 (diff)
downloadlinhes_dev-7eb5c8a2169ff8f58a0c0d49a751271cd62a4276.zip
Merge branch 'testing' of git@linhes.org:linhes_dev into testing
Conflicts: build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
Diffstat (limited to 'build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686')
-rw-r--r--[-rwxr-xr-x]build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks0
1 files changed, 0 insertions, 0 deletions
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
index 1652f72..1652f72 100755..100644
--- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks