Merge branch 'master' into 1233-local

Conflicts:
	lib/linguist/language.rb
	lib/linguist/samples.json
This commit is contained in:
Arfon Smith
2014-09-16 16:36:10 -05:00
127 changed files with 143317 additions and 63763 deletions

34
samples/PHP/filenames/.php Executable file
View File

@@ -0,0 +1,34 @@
#!/usr/bin/env php
<?
$aMenuLinks = Array(
Array(
"Blog",
SITE_DIR,
Array(),
Array(),
""
),
Array(
"Photos",
SITE_DIR."photo/",
Array(),
Array(),
""
),
Array(
"About me",
SITE_DIR."about.php",
Array(),
Array(),
""
),
Array(
"Contact",
SITE_DIR."contacts.php",
Array(),
Array(),
""
),
);
?>