aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* releasing version 0.3.3-0ubuntu2~ppa3Ted Gould2010-06-301-2/+2
* * Upstream mergeTed Gould2010-06-302-0/+8
|\
| * Sync to trunkTed Gould2010-06-301-3/+3
| |\
| | * Ensuring that separators can't have submenusTed Gould2010-06-301-0/+1
| | |\
| * | | releasing version 0.3.3-0ubuntu2~ppa2~json3~subs1Ted Gould2010-06-291-2/+2
| * | | * Upstream mergeTed Gould2010-06-292-0/+8
| |\ \ \ | | | |/ | | |/|
| | * | Block separators from getting new submenusTed Gould2010-06-291-0/+1
* | | | releasing version 0.3.3-0ubuntu2~ppa2Ted Gould2010-06-301-2/+2
* | | | * Upstream MergeTed Gould2010-06-3016-141/+4919
|\ \ \ \
| * \ \ \ Sync to trunkTed Gould2010-06-301-3/+3
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merging in the added JSON functionality branchTed Gould2010-06-3011-74/+4551
| | |\ \ | | | |/ | | |/|
| | | * Flipping argv/c from reviewTed Gould2010-06-301-3/+3
| * | | releasing version 0.3.3-0ubuntu2~ppa2~json2Ted Gould2010-06-291-2/+2
| * | | debian/libdbusmenu-jsonloader0 moving to 1 to matchTed Gould2010-06-293-1/+8
| * | | releasing version 0.3.3-0ubuntu2~ppa2~json1Ted Gould2010-06-281-2/+2
| * | | Glib library too.Ted Gould2010-06-282-0/+2
| |\ \ \ | | | |/ | | |/|
| | * | Adding in the glib lib too.Ted Gould2010-06-281-0/+1
| * | | TypoTed Gould2010-06-282-2/+2
| |\| |
| | * | TypoTed Gould2010-06-281-1/+1
| * | | Adding in the additional libraries.Ted Gould2010-06-282-2/+4
| |\| |
| | * | Adding the need libraries for making the library.Ted Gould2010-06-281-1/+2
| * | | debian/control, debian/libdbusmenu-jsonloader*install: AddingTed Gould2010-06-284-1/+37
| * | | AutogenTed Gould2010-06-283-68/+330
| * | | * Upstream MergeTed Gould2010-06-2811-74/+4550
|/| | | | |/ /
| * | Getting the depends in order.Ted Gould2010-06-281-1/+1
| * | Forgot copyright headersTed Gould2010-06-284-0/+82
| * | Not sure why this flipped, but whatever.Ted Gould2010-06-281-1/+1
| * | Look at all the values instead of just the first.Ted Gould2010-06-281-1/+1
| * | Better name, distcheck fix, cleanup. Good stuff.Ted Gould2010-06-281-3/+7
| * | Comparing at the end and running under XvfbTed Gould2010-06-281-0/+2
| * | Setting timeout longerTed Gould2010-06-281-1/+1
| * | Redirecting output to a file.Ted Gould2010-06-283-3/+13
| * | Starting to link things together... still not working.Ted Gould2010-06-283-4/+7
| * | Adding a test-client binTed Gould2010-06-283-0/+47
| * | Have the proper case for booleansTed Gould2010-06-281-0/+6
| * | Hmm, bug in dbusmenu-dumper there.Ted Gould2010-06-281-1148/+1148
| * | Adding in a test json file.Ted Gould2010-06-282-1/+4025
| * | Adding a JSON loaderTed Gould2010-06-283-2/+101
| * | Okay, now we've got some basic code for dealing with value arraysTed Gould2010-06-281-0/+31
| * | Okay, so now we're handling the complex areas.Ted Gould2010-06-281-3/+26
| * | Turn objects into hashmapsTed Gould2010-06-281-1/+32
| * | Restructuring a bit to make it more reusable.Ted Gould2010-06-281-13/+24
| * | Make the code behave exactly the same but with a function call in the middle.Ted Gould2010-06-281-5/+20
| * | Moving the JSON parsing code into the library.Ted Gould2010-06-284-70/+98
| * | Adding a new testing lib.Ted Gould2010-06-286-0/+59
| |/
* | releasing version 0.3.3-0ubuntu2~ppa1Ted Gould2010-06-281-2/+2
* | Merging in Ubuntu Desktop branchTed Gould2010-06-281-3/+3
|\ \
| * | releasing version 0.3.3-0ubuntu1Sebastien Bacher2010-06-241-1/+1
| * | * New upstream release.Ken VanDine2010-06-2434-283/+1373
| |\ \
* | | | releasing version 0.3.3-0ubuntu1~ppa2Ted Gould2010-06-281-2/+2