summaryrefslogtreecommitdiffstats
path: root/user_guide/images
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-04 22:59:52 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-04 22:59:52 +0100
commite917f9be8b05c81357c1c2c9730d5060685d644d (patch)
treeb6a7d5ce8ba57b69ba61454f77829b04f2ce5974 /user_guide/images
parent5b2d2da5ae2e97043c6bef53e565d30e50196e2b (diff)
parente1f6e9ddff788f6a154f5f35dc117d14aeb0c484 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'user_guide/images')
-rw-r--r--user_guide/images/ci_logo.jpgbin5602 -> 9035 bytes
-rw-r--r--user_guide/images/ci_logo_flame.jpgbin8589 -> 13862 bytes
-rw-r--r--user_guide/images/ci_quick_ref.pngbin94476 -> 150187 bytes
-rw-r--r--user_guide/images/codeigniter_1.7.1_helper_reference.pngbin67388 -> 109471 bytes
-rw-r--r--user_guide/images/codeigniter_1.7.1_library_reference.pngbin111747 -> 182066 bytes
-rw-r--r--user_guide/images/nav_bg.jpgbin441 -> 503 bytes
6 files changed, 0 insertions, 0 deletions
diff --git a/user_guide/images/ci_logo.jpg b/user_guide/images/ci_logo.jpg
index 3ae0eee07..9ab5a8e24 100644
--- a/user_guide/images/ci_logo.jpg
+++ b/user_guide/images/ci_logo.jpg
Binary files differ
diff --git a/user_guide/images/ci_logo_flame.jpg b/user_guide/images/ci_logo_flame.jpg
index 17e9c586b..5bf38adbb 100644
--- a/user_guide/images/ci_logo_flame.jpg
+++ b/user_guide/images/ci_logo_flame.jpg
Binary files differ
diff --git a/user_guide/images/ci_quick_ref.png b/user_guide/images/ci_quick_ref.png
index c07d6b469..a4aa49585 100644
--- a/user_guide/images/ci_quick_ref.png
+++ b/user_guide/images/ci_quick_ref.png
Binary files differ
diff --git a/user_guide/images/codeigniter_1.7.1_helper_reference.png b/user_guide/images/codeigniter_1.7.1_helper_reference.png
index 15a7c1576..6a7d9f8c9 100644
--- a/user_guide/images/codeigniter_1.7.1_helper_reference.png
+++ b/user_guide/images/codeigniter_1.7.1_helper_reference.png
Binary files differ
diff --git a/user_guide/images/codeigniter_1.7.1_library_reference.png b/user_guide/images/codeigniter_1.7.1_library_reference.png
index 7f054f95f..08636857e 100644
--- a/user_guide/images/codeigniter_1.7.1_library_reference.png
+++ b/user_guide/images/codeigniter_1.7.1_library_reference.png
Binary files differ
diff --git a/user_guide/images/nav_bg.jpg b/user_guide/images/nav_bg.jpg
index 440e04ddb..35640707b 100644
--- a/user_guide/images/nav_bg.jpg
+++ b/user_guide/images/nav_bg.jpg
Binary files differ