/lenasys/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/lenasys/trunk

« back to all changes in this revision

Viewing changes to Code Viewer Alt/AJAX/AjaxDemoApp0_getCustomer.php

  • Committer: Gustav Hartvigsson
  • Date: 2013-04-08 08:05:58 UTC
  • mfrom: (19.4.4 lenasys)
  • Revision ID: gustav.hartvigsson@gmail.com-20130408080558-0o7itutyu7jrn48b
Note to self: "bzr resolve --all" works like magic.
Merged implementation group 1's branch.
20130408.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Code Viewer Alt/AJAX/AjaxDemoApp0_getCustomer.php
8
8
 
9
9
        include("../Codeviewer/showcode.php");
10
10
        
 
11
<<<<<<< TREE
 
12
        menulayout("AjaxDemoApp1_storeCustomer.php","","AjaxDemoApp0_getCustomer.txt","AJAX Example 0: Get Customer AJAX API","AjaxDemoApp0_getCustomer.html","AjaxDemoApp0_getCustomer.html");
 
13
=======
11
14
        menulayout("AjaxDemoApp1_storeCustomer.php","","AjaxDemoApp0_getCustomer.txt","AJAX Example 0: Get Customer AJAX API","AjaxDemoApp0_getCustomer.html","AjaxDemoApp0_getCustomer_description.html");
 
15
>>>>>>> MERGE-SOURCE
12
16
        
13
17
        $interestingrows = array(array(8,18,"Ajax function"),array(20,34,"Ajax return function"));
14
18
        $keywords = array("showCustomer","ResultCustomer",'"Haakon"');