Merge branch 'master' of git.calculate.ru:/calculate-desktop

master3.3
Самоукин Алексей 14 years ago
commit 1940cf09d9

@ -37,19 +37,19 @@
"other": { "other": {
"children": [ "children": [
{ {
"name": "Calculate - LinuxQuestions.org", "name": "Calculate Linux | Facebook",
"type": "url", "type": "url",
"url": "http://www.linuxquestions.org/questions/calculate-89/" "url": "http://www.facebook.com/group.php?gid=97309000613"
}, },
{ {
"name": "LinuxTracker", "name": "Calculate - LinuxQuestions.org",
"type": "url", "type": "url",
"url": "http://linuxtracker.org/" "url": "http://www.linuxquestions.org/questions/calculate-89/"
}, },
{ {
"name": "Calculate Linux | Facebook", "name": "DistroWatch.com",
"type": "url", "type": "url",
"url": "http://www.facebook.com/group.php?gid=97309000613" "url": "http://distrowatch.com/"
}, },
{ {
"name": "Gentoo Linux", "name": "Gentoo Linux",
@ -57,9 +57,9 @@
"url": "http://www.gentoo.org/" "url": "http://www.gentoo.org/"
}, },
{ {
"name": "DistroWatch.com", "name": "LinuxTracker",
"type": "url", "type": "url",
"url": "http://distrowatch.com/" "url": "http://linuxtracker.org/"
}], }],
"type": "folder" "type": "folder"
} }

@ -37,29 +37,29 @@
"other": { "other": {
"children": [ "children": [
{ {
"name": "K Notes", "name": "DistroWatch.com",
"type": "url", "type": "url",
"url": "http://knotes.ru" "url": "http://distrowatch.com/"
}, },
{ {
"name": "Lunuxoid", "name": "Gentoo Linux",
"type": "url", "type": "url",
"url": "http://tux.in.ua" "url": "http://www.gentoo.ru/"
}, },
{ {
"name": "В Контакте | Calculate Linux", "name": "K Notes",
"type": "url", "type": "url",
"url": "http://vkontakte.ru/club10221243" "url": "http://knotes.ru"
}, },
{ {
"name": "Gentoo Linux", "name": "Lunuxoid",
"type": "url", "type": "url",
"url": "http://www.gentoo.ru/" "url": "http://tux.in.ua"
}, },
{ {
"name": "DistroWatch.com", "name": "В Контакте | Calculate Linux",
"type": "url", "type": "url",
"url": "http://distrowatch.com/" "url": "http://vkontakte.ru/club10221243"
}], }],
"type": "folder" "type": "folder"
} }

Loading…
Cancel
Save