diff options
| author | Patrick Simianer <p@simianer.de> | 2012-04-23 21:44:02 +0200 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2012-04-23 21:44:02 +0200 |
| commit | 2f427278616cbe3fa6f56d6b97c40b3894dbd950 (patch) | |
| tree | 6998435e4677437c474cf0f835ce9f72d70d3945 /LICENSE.txt | |
| parent | 6d0d0eb6bbfaee6b6998659a55e2195977ccd217 (diff) | |
| parent | 217c4aaeba1c9f19b3420b526235bffd86c7a92b (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
Makefile.am
configure.ac
Diffstat (limited to 'LICENSE.txt')
0 files changed, 0 insertions, 0 deletions