labofsahil/github-event-dataset-2012 huggingface dataset:
debian stability updates

git-svn-id: svn://svn.caucho.com/home/svn/svnroot/resin/trunk@9877 9c94448d-38f1-0310-a231-d98308ff1ebf
dist issues with debian

git-svn-id: svn://svn.caucho.com/home/svn/svnroot/resin/trunk@9878 9c94448d-38f1-0310-a231-d98308ff1ebf
svn update

git-svn-id: svn://svn.caucho.com/home/svn/svnroot/resin/trunk@9879 9c94448d-38f1-0310-a231-d98308ff1ebf
build updates

git-svn-id: svn://svn.caucho.com/home/svn/svnroot/resin/trunk@9880 9c94448d-38f1-0310-a231-d98308ff1ebf
remove unneeded markup
Pretty some more show views
Latest designs
Merge branch 'master' of https://github.com/mercul3s/strengthisbeautiful
add audio file for tests
Update index.html

changed name of Week 8 file
added dibi & composer autoloader
incluido thumbnail a videos
In IPTC, extracting an item now tries to add keywords as tags.
Fixing allcaps typo.
Merge pull request #124 from chalbertgit/master

Incorporated tag module's add keyword into iptc::extract
Merge pull request #126 from mikemayer67/master

Add Event Watcher module
[#1563] Corrected an introduced bug when a tag is created and reworked so that the extract function recreates tags for when iptc data is rescanned.
Merge pull request #127 from chalbertgit/master

Fixed an introduced bug and verified the new implementation works properly
Write ini files to tmp folder to avoid write permissions errors
Use TMPPATH instead of VARPATH
Reflect version in change in module_installer
Merge pull request #128 from DanielMuller/master

[modulesupdates] Use tmp folder for ini files
Merge pull request #10 from gallery/master

Retrofit gallery/master into mikemayer67/gallery3
Merge pull request #13 from mikemayer67/master

Retrofit gallery/master into mikemayer67/gallery3
changed `Route.rules` array validation to be case insensitive. see #49
made route matching case insensitive. see #53
add option to toggle case sensitivity. see #53
set ignoreCase to false by default. see #53
fix typo on changelog
Query strings should respect the shouldTypecast property.
Merge remote branch 'bramstein/master' into dev

* bramstein/master:
  Query strings should respect the shouldTypecast property.
  update signals to latest
  bump version to 0.10.0
refactor match and parse specs to avoid redundant `shouldTypecast` reset, update changelog.
add crossroads.pipe() and crossroads.unpipe(). closes #70
Merge branch 'ignorecase' into dev and change ignoreCase to true by default. closes #53. closes #49.

* ignorecase:
  fix typo on changelog
  set ignoreCase to false by default. see #53
  add option to toggle case sensitivity. see #53
  made route matching case insensitive. see #53
  changed `Route.rules` array validation to be case insensitive. see #49

Conflicts:
	CHANGELOG.md
	dev/src/crossroads.js
	dev/src/route.js
	dev/tests/spec/match.spec.js
bump version to 0.11.0a and do a build
add test for resetState()
add ignoreState. closes #57
Merge branch 'dev'

* dev:
  add ignoreState. closes #57
  add test for resetState()
  bump version to 0.11.0a and do a build
  add crossroads.pipe() and crossroads.unpipe(). closes #70
  refactor match and parse specs to avoid redundant `shouldTypecast` reset, update changelog.
  Query strings should respect the shouldTypecast property.
  fix typo on changelog
  set ignoreCase to false by default. see #53
  add option to toggle case sensitivity. see #53
  made route matching case insensitive. see #53
  changed `Route.rules` array validation to be case insensitive. see #49
bump version to 0.11.0
first test of Lexer
first two tokens
Merge remote-tracking branch 'origin/master'

Conflicts:
	Srangospodna/src/main.cpp
First commit! A basic theme, a name, and two posts

I should probably add the JavaScript that handles the "selected" state
soon. And also figure out a way to get some kind of default page to show.
You know, not a completely white piece of voidness.

It's also got Google Code Prettify, which was nice to set up.
Added: cool javadoc refs #1020
new navigation implementation for categories

same as tag method
Post scripts!
[ios] Fixing LocalStorage not persisting on first app launch on ios6

Fixes: https://issues.apache.org/jira/browse/CB-1535#comment-13463843
Implement asyncEcho in the iOS echo plugin.
Change XHR bridge mode to succeed instead of fail.

It's 20% slower to use a successful request, but it prevents spamming
the iOS6 web inspector console.

Addresses issue: https://issues.apache.org/jira/browse/CB-1476
Various spelling & grammer fixes.
Delete unused CordovaBuildSettings.xcconfig from project template.
Move test lib and test app out of CordovaLib.

Also removes unused: CordovaLib/Makefile and CordovaLib/javascript
Tweak pre-commit message to make command more copy&paste-able.
Convert unit tests to ARC.
Change create script to copy CordovaLib into new projects.

Fixes issue: https://issues.apache.org/jira/browse/CB-1526
Don't URL-encode FileTransfer.upload's response field.

Fixes issue https://issues.apache.org/jira/browse/CB-1571
Tweaks to iOS XHR bridge:

Call [[self client] didReceiveResponse] when simulating a response
  - This fixes the CFNetwork log message.
When XHR bundles payload, do not handle the request.
When XHR does *not* bundle payload, use the new "rc" field to only check
for messages once instead of multiple times.

This fixes https://issues.apache.org/jira/browse/CB-1576
Update uncrustify hook to make the commands more copy & pastable (again)
Add --shared optional parameter to create script

for including CordovaLib directly instead of using a copy of it.
Remove commandDelegate property of CDVViewController.

It didn't make sense since the CDVViewController *is* the
commandDelegate.
ちょっとコード整形
間隔系の設定が即時反映されないのを修正
Merge branch 'release/0.4.2'
間隔系のオプションが即時反映されない不具合を修正した。
Site updated at 2012-12-15 00:12:57 UTC
Dileep | Adding repository details
we want that json file
Bug 796995 - create mozilla-esr17 branch. r=catlee
syntax error missing parenthesis
Added new netlogo source file with combined graphs for cars and buses.
Products Turkish translations updated
live list activity update
Major regex tweaks for removing missing BibTeX fields from references.
removed .idea folder
Commit for merge
For merge
Merge branch 'master' of https://github.com/nachtigall-83/ese2012-web-ui

Conflicts:
	app/app.rb
Some corrections in app.rb
Adding new resume and changing background color
adding bench mark files part 2
Site updated at 2012-09-13 12:57:23 UTC
7 도형저장하기
Initial source import 58
Only catch ExecJS::ProgramError while compilation.
Test on 1.8.7 and 1.9.2 in parallel.
Fix compilation when using a simple watch expression. (Closes #11)

Set the output directory to the current working directory when
no `:input` or `:output` option is provided, or the watcher regexp
contains no match group.
Release 0.5.5
detect webcam js

Signed-off-by: hgun77 <hgun77@gmail.com>
Tidy pom, specifically around override of compile properties
moved files

moved unused testing/commented files to a "testing" folder
setup DDO app
fixed typos; added ability for some config from the environment
Code Überarbeitung Content Element

Anpassung an Standards
keine TABS sondern 4 Leerzeichen...
Module nach Standard
Code auf Standard der Rest
letzte Korrekturen

Tabs mit 4 Leerzeichen, Variablen umbenannt, Code optimiert
das sollte es gewesen sein
Merge pull request #3 from nlsh/Korrektur-Code-auf-Standard

Korrektur code auf Standard
v0.6.15 を追加
Merge pull request #95 from summerwind/master

ChangeLog に v0.6.15 を追加しました
Updated Froggy to show mozilla shortcuts
don't need that field
openhdf: build 22
Base url fix. No fix for file upload
don't reinstall openblock everytime now that it's editable
use OpenRural as page title
setup Python logging with optional Graylog2 handler; refs #17
add Graylog2 logging to staging environment
move optional file handler to local settings
Work in progress on updating the import script for whiteville restaurant inspections.
Merge branch 'master' of github.com:openrural/columbus-county-nc
Update whiteville props retrieval script to use both the structures and parcel shapefiles.
change name of props logger
Merge branch 'master' into data-dashboard
begin adding base scraper and models
begin fleshing out data dashboard interface
add pretty logging formatter called "basic"
add breadcrumbs
make branding
changed initial map bounds. closes #38
added spatial lookup field to geosound search index
trying to get the hypers alive logic better so we can figure out whats potting
Merge branch 'master' of github.com:ottobehrens/gemstone-scripts
most modules are now properly aligned, added some pics
Add nuspec template.
Initial Commit
Merge pull request #1 from bahamas10/master

yep
alias fix and appfog site url change due to phpfog shutting down
Octopress init
Site updated at 2012-04-08 13:16:31 UTC
bz19346: Update Apple device conversion matrix.
start of the .feature file for gui testing with lettuce and sikuli
Merge branch 'master' of github.com:pculture/mirovideoconverter3
version 1.2 and code version 4

for upload purposes on google play
Fix bug in JiraController.CreateIssuesUrl
initial imprt from tls-tunnel
Updated paths and namespaces on README.markdown.
Checked-in AndroidHybrid functional testcases.
Merge branch 'boston' of https://github.com/phresco/android-hybrid-eshop into boston

Conflicts:
	test/functional/pom.xml
sync with original sources.
Added code to assign recovered partitions to Worker(s).
removed filename member from GraphPartitioner
Fixed small changes in register and lookup methods

Conflicts:
	Pregel/src/main/java/system/Master.java
workaround for jquery bug in bl_checkbox_submit when the form title attr is missing (see http://bugs.jquery.com/ticket/5571)
Mise en place envoi de mails
Merge branch 'develop' of github.com:projetpeip-montp2/badger-www into develop
Backend: Amélioration édition packages
Implemented ordered keys inserted for _trie.Node with supporting tests
Ensure names are unique within a class
play, pause, stop
(#14670) autorequire a file_line resource's path

If we manage a file we edit with file_line, it should be autorequired by
file_line.  Without this patch applied the relationship is not
automatically setup and the user is forced to manually manage the
relationship.
(#14670) Fixup file_line autorequire specs

Without this patch applied the file_line autorequire examples are
failing.  This is a problem because the failures are false positives and
should be passing given the implementation.

This patch fixes the problem by changing the examples to directly test
the existence of the relationship by finding it in the list of
autorequire relationships.
Merge branch 'fun/2.x/14670_file_line_autorequire' into 2.x

* fun/2.x/14670_file_line_autorequire:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path
stub out `os` module
added lessphp
minor: removed unnecessary verbose console logs
Compiling version after the modifications. Now I will start testing and adding the required data.
* new relationship between genres and tags
* improved playlist generation
* Discogs Analyzer thread
* various fix
Only use one version of ember
Bump ember
Bumping version to 1.13.2
temp commit
some deletes
uploads out of git
Probando el agregue con la herramienta Source Tree
domain

cname
updating to final project status
added combinedfs
Wrap name in quotes
Style modifications and minor improvements
Site updated at 2012-08-17 14:01:40 UTC
Added preliminary database schema
prod env database.yml
implemented About dialog

 * some values are set in the Glade-UI definition (license text, copyright, authors)
 * others are set in main() using Autoconf-defined macros to avoid redundancies
First addition of a node.js backend. To be concluded
REST API commented. Data persistence layer to be added
it looks pretty now.
Remove broken libraries
Update to work (hopefully) with working libraries
fix image size and twitter to right side
Added areaAlpha as an option for generating graphs. This is supported starting in graphite 0.9.10
Removed camelcase from areaAlpha. Now area_alpha
Merge pull request #26 from tparker00/master

Added ability to define areaAlpha
last file?
Switched to new dev version and added release dates
IBaseFolder must inherit IFolder since BaseFolder is a subclass of Folder
Quick fix for LocalPeer init arg
Downloading new files on tracker. File changed for new files works to notify tracker. Checksum fixed. Other small issues fixed. Next: finish up with file changed
Site updated at 2012-10-06 16:07:28 UTC
switched esty and mailchimp
Rebase from release/image_common
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.14
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.14
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.14
Some more touch ups in the ui.
Form components now held in a map rather than list
Refactored behaviour from saveable form to form components object
Missed this in last version bump :(

Really need to update the doc generator to do this sort of thing automatically...
invoice file in php
Moved all base logic to sublogic class
make -PupdateLucene the default
'Automated commit from oration.generate_html at 2012-10-26T16:12:19.689300'
Remove the test exception block
Site updated at 2012-05-06 02:13:59 UTC
Added django-announcements support
Rearranged environment related scripts
Add environment upgrade related script
fix link rbac.methods
Word "characterset" changed to "charset" in adapter configuration
Update docs/languages/es/user-guide/skeleton-application.rst
Merge pull request #428 from guprado/patch-2

Update docs/languages/es/user-guide/skeleton-application.rst
Merge pull request #427 from luinnar/fix/zend-db-adapter

fix incorrect DB driver charset configuration
Merge pull request #426 from samsonasik/fix/link-rbac-method

fix link rbac.methods
use pipelines mapping
Merge pull request #99 from andrewjpage/pipeline

use pipelines mapping
Site updated at 2012-05-08 11:24:04 UTC
FIX: move QualityIsNeverMoreThan50Test class under src/test/java
added chat broadcasting
Add forgotten -i to sed.
Fixing video links.
Merge pull request #7 from scottcaruso/master

Pushing Master to gh-pages.
Changed order x-axis.
implement passwd & group tests
Fixed typo at Resources/doc/index.md
Various updates
Merge branch 'master' of https://github.com/sdiaz/FOSRestBundleByExample
new file:   bcb_xe-javascript/javascript.cbproj
	new file:   bcb_xe-javascript/main.cpp
Fixes spec for 'recursively' method in ruby 1.8.7
added cukmeans.py and flkmeans.py
Site updated at 2012-10-06 09:35:43 UTC
Site updated at 2012-09-29 16:31:31 UTC
Site updated at 2012-09-22 13:49:17 UTC
Updating Thrird file in master
Testing pull repo
test
testsousbranche
Merge branch 'testsousbranche' into test
at last\! pivotal workstation setup scripts\!
Renamed printer test [ci skip]
NotImplementedError in base class
helper and csv data for the country abbreviation list
style and html structure adjustments
saving final data
moved Grid files to framework package
Trying to fix one the junit tests
add all methods signature to xsd.
Merge branch 'development' of https://apanazzolo-sn@github.com/societies/SOCIETIES-Platform.git into development
added CAUIPrediction and CAUIDiscovery to personalisation-bundle
Merge branch 'development' of https://EPapadopoulou@github.com/societies/SOCIETIES-Platform.git into development
o update tycho-support
o remove assembly plugin
use TableGen
Filter logs by db access
Increased version number
Update src/Harvest.java
Added geocommons documentation  and updated u/i screenshots
Merge branch 'master' of github.com:spatialnetworks/fulcrum_docs
Adding image files
Readme
Merge branch 'master' of github.com:spatialnetworks/fulcrum_docs
Merge branch 'master' into gh-pages
cleanup dirdump
Whoops. Re-add a link to /scripts/index.html to /index.html.
Wrap some lines in git-into-svn post.
Site updated at 2012-05-19 14:49:10 UTC
Fix and tests for issue #224
Initial version

- Have yet to fill out the example of a custom route, as I havn't got
  round to this myself yet.
Updated style and contents
ODM automapping missing

Create and list actions from dashboard were throwing: 
The class 'Symfony\Cmf\Bundle\RoutingExtraBundle\Document\Route' was not found in the chain configured namespaces Doctrine\ODM\PHPCR\Document

Comparing with cmf-sandbox config file, I noticed the config in this tutorial was missing:

    odm:
        auto_mapping: true

Adding this to doctrine_phpcr config fixes the issue.

PS only added this to jackrabbit config as I havent tried DBAL yet.
punctuation
grammar
whitespace
its => it's or even better, it is
typos
remove extra words
Merge pull request #46 from greg0ire/obvious_mistakes_fixes

Obvious mistakes fixes
Routing: getRouteKey additions
Merge pull request #47 from krizon/routing-additions

Routing: getRouteKey additions
cleanup naming about simple cms tutorial
Merge pull request #44 from zuhair-naqvi/patch-2

ODM automapping missing
add auto_mapping to all phpcr bundle config examples
Updated cookbook, added link to routing-extra
Merge pull request #42 from dantleech/creating-a-custom-route-repository

Initial version
Fixed indenting issue

as mentioned in symfony/symfony-docs#1977
Merge pull request #48 from WouterJ/patch-1

Fixed indenting issue
tweaked introduction (fixes #1)
Initialized Eclipse project for Graded Reader.
Authored by H4102
Merge branch 'master' of github.com:tdubourg/packaging-simulator
Add tadaa link
Completes #2
Fixed force close when loading prices.
Updated structure
Structure change
Updated Readme
Readme update
Modifs in instructions
Remove ruby 1.9.2 an ruby-head support.
Added the new marker icon
Merge remote-tracking branch 'origin/master'
Only treat identity restores with very high prio
Adding jsdoc-contracts to structure
made the tool bar prettier
backing up sql database
andere opzet
nieuwe slide
betere events aan de api kant
taunt support
engine-shutdown gefixed
firedBy property voor projectiles
Ensure Travis CI build status is for the master branch.
In with Emmet, out with ZenCoding
Removes talks.html from holman
Posted information on deliverables
calculate scores for inspections
Order of targets
added indicator partners
indicator may belong to more than one partner
modification
some more tweaks
Google drive connecting test
try using jquery to show and hide message
Marked StockMetrics members final. removed cmts suggesting calculated values
Merge branch 'master' of https://github.com/veswill3/InvestmentSimulator

Conflicts:
	src/com/investment/simulator/StockMetrics.java
Added Asp.Net MVC 3 to the list of technologies used into index.html
Update AT&T demos to jQuery 1.1.1 and update README
Can be compiled on Ubuntu 11.10.
Updated _posts/entries/2012-11-06-ftp.md
Changed contact details
Version bump to 1.2.0
Regenerate gemspec for version 1.2.0
Augment README.md
Fixed links to csv and html folders
replacing junit by spock test framework
added test for include statements
asdf
Merge branch 'master' of github.com:vrchlpet/WA2_Project_control
Site updated at 2012-06-18 02:58:58 UTC
DEV : pole metier, galerie au choix

Signed-off-by: webmasterpf-DG <webmaster@provence-formation.com>
+ Creating debian mods for distro: precise, rosdistro: fuerte, upstream version: 0.1.2
+ Creating debian mods for distro: oneiric, rosdistro: fuerte, upstream version: 0.1.2
+ Creating debian mods for distro: lucid, rosdistro: fuerte, upstream version: 0.1.2
+ Creating debian mods for distro: precise, rosdistro: fuerte, upstream version: 0.1.2
+ Creating debian mods for distro: oneiric, rosdistro: fuerte, upstream version: 0.1.2
+ Creating debian mods for distro: lucid, rosdistro: fuerte, upstream version: 0.1.2
Imported Upstream version 0.1.3
Merge tag 'upstream/0.1.3'

Upstream version 0.1.3
+ Creating debian mods for distro: precise, rosdistro: fuerte, upstream version: 0.1.3
+ Creating debian mods for distro: oneiric, rosdistro: fuerte, upstream version: 0.1.3
+ Creating debian mods for distro: lucid, rosdistro: fuerte, upstream version: 0.1.3
Remove direct-link alert
In fact for RefreshToken.
Added plugin usage documentation.
Update some setting about auto-complete.
update to latest auto complete from github.
Solve the problem the quick help do not popup in emacs 24.
working on class subject exam mapping etc
Merged and commiting again
删除更改
Site updated at 2012-11-26 08:16:53 UTC
Site updated at 2012-10-04 05:27:33 UTC
Site updated at 2012-10-09 13:09:56 UTC
Octopress init
Site updated at 2012-07-16 04:21:45 UTC
Site updated at 2012-07-16 08:31:15 UTC
Site updated at 2012-07-25 14:18:34 UTC
Site updated at 2012-07-29 09:31:37 UTC
Site updated at 2012-07-29 15:23:33 UTC
Site updated at 2012-07-29 15:25:42 UTC
Site updated at 2012-07-29 15:40:47 UTC
Site updated at 2012-07-29 15:46:45 UTC
Site updated at 2012-07-29 15:49:16 UTC
Site updated at 2012-08-06 16:40:33 UTC
Site updated at 2012-08-18 17:41:25 UTC
v0.003004

 [DOCUMENTATION]
 - Add pointers to Dancer::Template::Mason2. (thanks to  Marc for the
   inspiration ;-) )
Moo-refactored
work for D2
Merge branch 'dancer2'
dependencies
Build results of a222c4b (on master)
add symbol after translation so that it can be searched by user easiler
prepend or append symbol to value
Fixed typos in chapters 11 - 13
Fixed typos in chapters 15 - 17
Merge branch 'spelling'
Form para Place
Address, still need to be included in places form
index and detailed view for address
places:new migration!! + views

please run the command rake db:drop db:create db:migrate
address form embedded into the places create form
new link to see the address of a place
Address can't be edited separately from its place
Merge pull request #1 from zauberlabs/places-and-address

Places and address
Site updated at 2012-08-18 06:07:06 UTC
Site updated at 2012-08-18 17:24:03 UTC
Adding non versioned files
Don't know if this helps at all but you forgot 	tmp.add("net.minecraft.server.EntityThrownExpBottle"); and the  		tmp.add("net.minecraft.server.EntityIronGolem"); in the Entities
i added them in
Player now obides to laws of physics in a better way
WorkItem 4587: added an integrated backlog-and-iteration autocomplete
option now that backlogs no longer include iterations; also made unit
tests 66 and 67 function the way Jarno would like
emulator encoder, the most boring stuff done
Update Bootstrap
Update submodules
Added possibility to set sequence nr (needed to make it optional)
[maven-release-plugin] prepare release testsuite-0.3.3
Changed scm to github
[maven-release-plugin] prepare release testsuite-0.3.3
Support changing remote repo urls.

Change-Id: I3f9dbd638ea7a29c4e2ea08d5cc6e1f239c2e65a
Reviewed-on: https://review.openstack.org/11234
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
Simplify make_string_interop.hpp() implementations.
Both VC++10 and ICL 12 passing. GCC 4.6.2 still fails to compile.
Adjusting the game block layout.
Adding the color brown so that BC datasets all have 10 items.
nixing the test data.
Correcting the BC level difficulty correction.
Tiny cleanup.
Merge branch 'master' of github.com:CalPolyGameDevelopment/attell

Conflicts:
	Assets/Scenes/Start.unity
The BC hint bars are now spaced more equally though the screen height.
Adding a side pane behind the info bars.
Updating the background color.
Look 'n feel changes.
Race-condition proofing the info bar set functions.
Creating mechanism to get the name of the source dataset for a particular solution within the sln manager.
Setting the labels of each info bar pair to be the name of the source dataset.
Code to make sure the bar labels are properly capitalized.
Drawing the label above the bar instead of inside the bar for readability.
Updated the reflections and wrote everything except for the test-section
Merge branch 'master' of github.com:ChristofferKarlsson/Labyrinth
new version 2.0.1
Use $::osfamily in stead of $::operatingsystem
Merge pull request #8 from vaneldik/master

Using $::osfamily to make it work on RedHat derivatives
Added support for Unix sockets and verbosity.
need false not to cross the condition.
rake spec should set exit status on failure

This change enables 'rake spec' to set exit status to check for
success/failure (for example in CI tools
rake spec runs without modification

Add an empty site.pp file in spec/fixtures/manifests
Update spec_helper.rb to find the manifest in fixtures
Saner defaults and cosmetic template improvements.
Merge pull request #10 from fcharlier/rake_spec_exit_status

Fix rake spec exit status
Merge pull request #9 from acceso/master

Support for Unix sockets and verbosity.
fix unix socket support
Show osfamily in unsupported platform error message
fix rspec test (fixes #11)
Remove a trailing comma for compatibility with puppet 2.6
Merge pull request #12 from branan/remove_comma_for_2.6

Remove a trailing comma for compatibility with puppet 2.6
version 2.0.2
Only pass one glance_api_servers param to nova
push new kernel
apns: updated 404-43, bpl -> vodafone

Change-Id: Ic50237707c13b5c88b15d21c58a5b625885ed908
prebuilt: common: apns-conf-cdma.xml: add Sprint and VZW LTE/eHRPD apns.

Change-Id: I30e50bc276598e7b0c8835e60acf3189df406eff
Merge "prebuilt: common: apns-conf-cdma.xml: add Sprint and VZW LTE/eHRPD apns." into jellybean
Merge remote branch 'cm/jellybean' into jellybean
reworking drop logic to run the delay BEFORE putting the drop in the queue. this way one person cant block to drop queue with a really long drop request
Integrated Twitter's Bootstrap for some basic styling since I'm a crappy
designer.
Update notes for submitted changes

* Fix 5897: Setting root access to "ADB only" doesn't work (from ics - NEW)
apns: Add SK Telecom roaming APN

Change-Id: Icfd0ae2cdb6d1b684f796f74d55b6237add7cad3
fixed wrong headers for decompression

In some archives the headers for each indivdual `ArchivMember` are incomplete.
And these incomplete headers would overwrite the actual headers with `0` which
results in a `ZlibException` (since `compressedSize` and `expandedSize` are `0`)
Merge pull request #758 from Dav1dde/patch-1

fixed wrong headers for decompression
Add new, lookup3-based jhash. See: http://burtleburtle.net/bob/hash/doobs.html
Added hover buttons
Added linaro-arm-linux--4.7.3 toolchain.
Service Interface für HelloService angelegt
removing zinnia.plugins
da das Nullen-Abschneiden verbugt ist und auch der Vergleich gegen Null
(0 != 0.000) hinkt habe ich hier eine eigene Funktion gebaut, einen
guten regulären Ausdrauck habe ich nichtgefunden, der auch alle
Sonderfälle abdeckt
Дык точно всё працуе?
use repo_presenter methods in repos#show view
dont update repo. include commits when retrieving bug fix cache
added tags
changed things.
New.
duplicate Admission code validation
finished error logging
ExceptionMapper refactoring
jmeter tests update
fixed block ids
PLINGO
kategoriserar
More changes to profile, some to dashboard
Use RouterInterface and not Router
Domain duplication
Added functionality for duplicating a domain using an existing domain's records.
Change TTL's for all records in a domain.
Display domain id on record listing page
Small bugfix
Split out the templates for easier editing
Merge remote-tracking branch 'upstream/master'

Conflicts:
	clouddns-gui.py
	templates/index.html

Applied the "accountId" changes to the new sections
added accountId changes to the new template files
Changes to allow it to still function without updating the clouddns-python libs
[mythtv-cmyth] Added GetCommbreakList and GetCutList functions to MythConnection class.
Sync headers for GetRecordingEdl.
Added GetRecordingEdl stubs to all addons.
[mythtv-cmyth] Implemented GetRecordingEdl function.
Merge pull request #5 from fetzerch/feature-edl

Feature edl
removes rogue comma
Arquivo de configs - conflitos
Resolvidos conflitos
Made it compile/compress better

17kb to 5.7 kb
worked on classes and messed with activities
Kompilliert nicht verm. fehlendes in .ast
Updated to use the AsyncFrame library to encode messages for sending across the serial link.
Ignore .cache
I've updated the SerialTest code to use an event listener to receive data from the port instead of looping on a thread. I've based the code on the example at http://rxtx.qbang.org/wiki/index.php/Event_based_two_way_Communication. This lets the app exit cleanly as previously the thread was blocking on the IO and wouldn't die when main exited.
Uniqify the parents
Does this work now?

It's a test program to find the right servo programs.
Merge remote-tracking branch 'origin/master'
Adding code for KelpBot
Merge remote-tracking branch 'origin/master'
Adding KelpBot Tasks/Constants
Merge branch 'master' of github.com:NHHSRoboticsClub/Kipr.Botball

Conflicts:
	src/utils/Constants.java
I changed the CBCJVM git module protocol from git to https
LAUSD blocks the git protocol.
KelpBot constants and tasks
Test program, more tasks,
Added ability to execute lists of lists.
Git to HTTPS
KelpDriveTrain Testing
Adding Tasks
Added ReleaseTask and included it in TaskChain&TaskRunner
Added initial information for the starting moves task chain.
Updated task chain system to be progressive.
Tasks
Merge branch 'master' into kelp

Conflicts:
	src/robot/BlockRobot.java
	src/utils/pathfinding/TurnTask.java
finished Changes to cbc
KelpDrive now has a working grabbing sequence.

Signed-off-by: Jae Kim <jaekim708@gmail.com>
Added existin code. Began working on settings page
fixed hearts for the overlay, and removed some residue in BlueMaggot class of old overlay, still some left.
saving pool subject
updated locations metadata package to include new "name to print on id card" attribute for Mirebalais Hospital Location
Removed unused files
Updated ignore files
Removed apikey
Fixed downstream tests
More Testing work
Renaming CI chapter to Automated Builds
CSV: write headers only if there are no rows to export
fixing tracklist
added dependencies back
adding comment to appserver
Merge pull request #27 from discipolo/7.x-1.x-panels

add back dependencies
libstagefright: Increase LPA buffer size to 512 MB and reduce buffer count to 2

Change-Id: I3164199c4cec6de384aceeee0a1d2f6c426e0e0f
libstagefright: Add flush in reset during LPA playback

-If next operation is performed during LPA playback, delay is
observed before moving to next clip.
-Flush in reset happens only when playback is paused.
-Remove pause check to avoid delay and flush in cases where
next clip has been selected.

Change-Id: I561d83f70ef391f14bdb52bb8a6ee075e31e9531
CRs-Fixed: 395477
libstagefright: Fix for crash during lpa playback

-During lpa playback, flush() is not issued if mReachedOutputEOS
is true. This prevents flush reaching to HAL even during pause
state and causes crash.
-Issue flush() in all cases as these checks are handled in HAL.

Change-Id: I0029c851ba6a029afc01e6a30620b071f9828665
libstagefright: Avoid flush if LPA playback is not routed

-On a previously closed LPA playback due to pausetimeout, if
reset is called flush is issued on closed sink leading to crash.
-Check if audio is routed before calling flush to avoid such
issues.

Change-Id: Iec24d063425b0a0017adcf0b3a576fbea0d8ef25
libstagefright: Deregister audio flinger client during LPA session close

-Mediaserver crash is observed during BT disconnect.
-Audioflinger client registered during lpa playback is never
 deregistered.
-Fix this by deregistering audioflinger client during LPA
 session close.

CRs-Fixed: 407397
(cherry picked from commit d36aeb2d863a0ba42f45dbb59cd144dbf2c62cd6)

Change-Id: I19ef959a3d35476b4689e6c917a0cf6ccb4ffa78
libstagefright: Add support for TCXO shutdown

-Add support for onPauseTimeout to close the Audio path after
3sec of pause. This allows TCXO shudown to happen.

Change-Id: I747edf146475df8c828294f01ffe38aba5a3eccf
libstagefright: Detect defers-output-buffer-allocation quirk

Change-Id: I6e4c89e8d491db6a9e67c986b5efdbd19165782d
audioflinger: Initialize effectspool buffer size during allocation

-Crashes are observed during start of lpa playback with effects
enabled.
-Effectspool buffer size is invalid before initial two writes. If
effectsthread tries to access these buffers in such invalid state
it leads to crash.
-Initialize buffer size to 0 during effectspool buffer allocation.

CRs-Fixed: 415067
(cherry picked from commit 36591e0b53d869320d2a78b2f3c7f43924cb78b3)

Change-Id: I2616cfbfe914448e6489837f5d8686a8def7a883
Frameworks/av: Fix for mediaserver crash in AudioFlinger

- UI freeze is observed while playing LPA clips with sound effects.
- While moving to next clip, effect process is still applying
  effects on last buffers. Meanwhile de-allocating the local buffers
  in DirectAudioTrack destructor on which effects are currently
  applying. Due to this crash is observed in effect process.
- De-allocate buffers once the effects thread is killed.

Change-Id: I67431f298b8da114db60de5cc27376d9ddce7da5
CRs-Fixed: 416093
Merge remote branch 'cyan/jellybean' into jellybean

Conflicts:
	media/libstagefright/OMXCodec.cpp
Adding data to menu.
CWM: Add special kernel for recovery building
boost thread is explicitly used, so link it (fixes compile error in groovy).
Merge pull request #2 from yujinrobot/fuerte-devel

Boost thread is explicitly used, so link it
Finally got an example clipPath working correctly, seems ok so far!
add slim stuff

remove cm stuff

Add target arch and fix dependencies

Fix build fingerprint and tabs
Change-Id: Ifc2abbf3ab130c3045667693d5e32498108508eb
fix the path for slim
Merge branch 'jellybean' into jb

Conflicts:
	slim.dependencies
Online update and checker now 100% done, Lots more layout fixes and adjustments , more streamlining,
Adding Gemfile and initial dependencies
Added MCForge 6 Level Loader
MCForgeLevelFormat.java
Merge pull request #3 from hypereddie10/master

MCForge 6 Level Loader
add readme file for streak dev tools
fix
removed .gitignore from wrong folder
fixed timer problem
Merge branch 'master' into moritz

Conflicts:
	stress_yourself_modules.jar
created new jar
again merge problems
Merge branch 'master' into lukas
Added faux123 22b1 kernel and powerhal

Added faux123 22b1 kernel and updated powerHAL to
add touch boost for his intellidemand governor.

Signed-off-by: Chuck Haines <chaines@codemonkeyjava.com>
remove the notification led light stuff from email for now.
reinsert calcGetLost at every departure
Fixed the dir name and updated readme
Added use for Biomes list and Poison Rate. (For Custom Biome Poisoning)

Untested!
(Akshay) Stop tar from printing all files while bootstraping
(Akshay/Ashwin) Implemented a logger
(Akshay/Ashwin) Source Fetcher is a singleton.
(Akshay) Logger with new formatter.
(Akshay) Source fetcher and Feed Parser using the logger
fixed project.properties for ant build
pnp4nagios templates: added total bytes to graph

The graph shows now the total values of in and out traffic based
on the seen timeframe.

Using the rrdtool TOTAL function and some calculating from bits
to bytes.
Merge pull request #4 from lazyfrosch/lazyfrosch-dev

pnp4nagios templates: added total bytes to graph
Fix the issue that ignores error handlers in base.
simpler way to look up error handlers in base.

Eventually it is just needed to merge @errors in both the namaspace module
and the base class. Sinatra::Base#error_block!() is enough functional to
chase up merged @errors as of v1.3.0.
Merge branch 'namespace-error-fix' of github.com:unakatsuo/sinatra-contrib into 1.3.x
contaturni page and todo list update
New version of Aura
taxonomy model cleanup and method upgrades
add a composer file for dependancy
Changed gsid to serial in schema for sessions table.
Fixed an issue with the Webview activity indicator not stoping when the view disappears, fixed an issue with the twitter activity indicator not stoping when an error pops up, ensured that the user was authenticated during a pull to refresh, show an error when there are no twitter accounts to load, and fixed an issue with pull to refresh in the twitter tab not operating smoothly.  Fixed #10, Fixed #9, Fixed #8, Fixed #7, Fixed #4
added a param object for dynamic templates
Rewrite expanded desktop functionality based on CM entry

http://review.cyanogenmod.com/#/c/25011/11

Names are more consistent,  on/off text, sw600dp drawable

Patchset 2: Shortened string name, fixed build

Change-Id: I2dd395c7f27789311b09cd429359915287f97d2d

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values-es/strings.xml
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
rewrite toggles part 1

Change-Id: Ibb033b320495069c90ab22c0c71ee2c93677ab25
rewrite toggles part 2

Change-Id: Ie25651da27d4d4965aa306a90b8d92367214c1bc
1.3, 1.4, 1.5 ja 1.6

käytettiin tekstieditorin "replace all" toimintoa seuraaville sanoille:

merkkijono --> characterString
lukija. --> reader.
luvut --> values
int kertaa --> int times
String nimi --> String name
int julkaisuvuosi --> int publishingYear
public Kirja --> public Book
this.nimi --> this.name
.julkaisuvuosi --> .publishingYear
 getNimi --> getName
 Kirja --> Book
 Henkilo --> Person
** Updated the Report Date Validation test.
** Patched to check the current format of date on the report.
Добавлен рунге-кутт с переменным шагом.
ui
kk
cabios login
Manipulate properties while AOT-compiling the project
Mark message as sent
Added is_connected function to zigbee interface
Add comment_sanitized to Action
Last minute changes to javadoc comments and added documentation doc
folder
updates to LoginManager, PasswordManager, Password, and their test classes

the test classes required a minor update of University's use of the
Student constructor and the addition of a University.hasStudent(int
studentID) method, and I'll push that next; just in case that addition
to University doesn't fly well w/the other code, I want to make it so it
can be rolled back w/o affecting the other updates.
Added config file for XTA2
removed BaseFlowTranslatorResolver.flowTranslatorResolver.addStandardFlowTranslators()
Refactored out send_log and added ckl endpoint.
added script.log to gitignore
pep8 and pylint cleanup
Updating README with instructions for ckl
Merge branch 'feature/ckl_support' into develop
Merge branch 'release/ckl_support'
Closes #24: now shows comment after stop if no project/issue
Let applications specify their own database.yml.
User can specify a gem source per gem

Here's an example snippet from a data bag file:
{
[...]
  "gems": {
    "thoughtbot-paperclip": {
      "version": "2.3.1",
      "source": "http://gems.github.com"
    },
    "rails": "2.3.9",
    "authlogic": "2.1.6",
    "haml": "3.0.17",
    "ice_cube": "0.5.1",
    "calendar_date_select": "1.16.1",
    "delayed_job": "2.0.3",
    "thinking-sphinx": "1.3.20",
    "factory_girl": "1.3.2",
    "will_paginate": "2.3.14",
    "bb-ruby": "0.9.5",
    "hpricot": "0.8.2",
    "sanitize": "1.2.1",
    "aws-s3": "0.6.2",
    "nokogiri": "1.4.3.1"
  }
}

All gems except thoughtbot-paperclip will use the default gem source,
http://rubygems.org.  The thoughtbot-paperclip gem will use
http://gems.github.com.
post: hello world
put posts on ./index
Added a converter for native files that creates hollow named objects rather than deserialising the entire graph.
Remove time limit for print
Remove unnecessary images
Fix format
Remove modifiable files
Fix touch
Fix rubber band effect
Restore default configuration
Fix format
Add styles
Initial Push to working branch
form progress

finish data-role types, divided fieldsets
begin validation
attempting to console log store data
update main.js
form validation, update bronze form
re-organize folders
final css and gold app
test
bronze
update file structure
update additem
[MOD-757] CustomPopover: Constrain the arrow position to the bounds of the popover
Merge pull request #42 from JeffEnglish/MOD-757

[MOD-757] CustomPopover: Constrain the arrow position to the bounds of t...
Package update script fixed
TECH - Ashok - Added Integration test for view all children page
Reimplementing Part 3 - Preserving Restful URL for Sort Title

Fixing the issue where the restfull part of the url was not getting
preserved. This fix is only for the sort title right now.
More socket option.
Version 1.3.4

Added AutoSMS feature
sweep out
added simple sandbox; added download to device batch (win)
add handler for logging configurations
bs_sched: do not die if HOSTARCH is not set

Hostarch needs to be set to activate crossbuild, stop crossbuild
and do normal build instead.

Fixes scheduler dies if hostarch is not set but used...
adding newrelic module
boah, die id's fangen bei 1 an zu zählen
fat header taken out of table
Fixed issue with NULL copy to clipboard
Adding new unimplemented project Flickr-on-tiles
Some ogginess
rm dead deps
misnnamed file
ibid
once more with feeling
Outcommented debugging code.
cleanup timeouts for lease requests
Added the tester project, made changes to printout method
Updating google-analytics snippet
version 1 - screenshot
minor fix to smartassV2
Remove more reference to undefined classes
Remove reset button and enable_change
Fix for 2.1
Merge pull request #239 from dvserg/master

Fix for 2.1
snort-dev2, fixed interface remove dir issue when iface rule stop, changed iface rule log dir
Only using hi-res startup image now.
Updated
CSS template
.gitignore
linked all .js files
delete
Add component.json for bower/yeoman support.
Update after alexrj's fixes
Line algorithm added
Update to fix blur event
Menu plus joli dans la version HTML non SCORM
Various fixes and changes

Sorted out most of the demon animations
Shuffling narrative text now works
fixed a few errors in configuration; skip cloning the cookbook again in the setup script
c and cpp gitignores

Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
Update to Build 2200 (Release Date: 11 June 2012)
add views/locations/index.html.erb
Do not need dlopen.
[gtk2] Make some modifications for OBS
[gnome-screensaver-ubuntu] Update to version 3.6.0 with Ubuntu release 0ubuntu1
Removing unneeded else in _selectPage() - o.onPageClick() is called regardless
Hyperplane can now work in Line2D's place (only 2-hyperplanes), added two new exception classes, more tests for Hyperplane, miscellaneous changes in other files' comments.

- New Hyperplane methods:
  * getCoefficients()
  * str()
  * operator==()
  * operator!=()
  * friend operator<<()
  * ratioDistance()               (any space_dimension)
  * parallelThrough()             (any space_dimension)
  * isParallel()                  (any space_dimension)
  * intersection()                (only 2-hyperplanes)
- New Hyperplane constructor using two Point instances (only 2-hyperplanes).
- Added tests for Hyperplane's new methods.
- Hyperplane's std::vector<> constructors now work with const_iterators.
- Added two new exception classes:
  * Not2DHyperplanesException
  * ParallelHyperplanesException
- Changed DifferentDimensionsException so that I can use it for Hyperplane too.
- Comment changes inside BaseProblem.cpp, Line2D.cpp, Line2D.h, Point.cpp
  and Point.h.
fixed broken html issue
markup complete?
Update cookbooks/config_tilecache/recipes/default.rb

one last time
support a new kind a fitnesse page called Free. Allowing you to choose the exact url to call
New READMEs
Merge branch 'master' of https://github.com/clementfarabet/ipam-tutorials
SM update
cleaning up unsup
Update notes for submitted changes

* [CC] add update_snapshot_name api support
Update notes for submitted changes

* Adding delete-services goal
Update notes for submitted changes

* Adding a v2 implementation for populating  CloudInfo
Update notes for submitted changes

* Implement support for Services in v2 cloud controller client
Update notes for submitted changes

* Release of org.cloudfoundry:cloudfoundry-client-lib:0.8.1
remove dump line
Merge branch 'master' of ssh://git@github.com/cntn02/Semantic-document-base.git
link to edit document page while viewing document detail
a start of boundary stuff
Merge branch 'master' of github.com:codeforamerica/freaky_mustard
add loading an rendering of neighborhood (or any) boundary to the map
transitions on the button styles
fix notch image
load list of cities, endpoint and query them as we zoom in
merge changes
imporve openrov scripts
First draft of first blog post added in html
handle case where node['domain'] is nil
Merge pull request #4 from bryanwb/master

YUMREPO-3  gracefully handle case where node['domain']  is nil
yumrepo v0.16.3

Set name/base_url to localdomain in the case Ohai `domain` is
unavailable.  Fixes chef-solo compilation error on Vagrant boxes.

Signed-off-by: Eric G. Wolfe <wolfe21@marshall.edu>
Remove patch from tree
Fix mirrorlist value (fixes atomic-penguin/cookbook-yumrepo#6)
Merge pull request #6 from dwradcliffe/fix-mirrorlist

Resource syntax correction

mirrorlist parameter should be boolean, not string.
Redundant attribute

Remove url in favor of mirrorlist string.
不要なファイルのソースの削除
new words list for innovation expo
added table_save to load/save metadata
Create some test for BarnesHut
Updating region class
Use better assets to render notebook gaps

Make it also a bit less tall
Fix height of treeview column headers

Also make the font color ligther
Forgotten files
More treeview headers fixes

Bold font and prelight state
accidently called the russian translation German
tweak low memory killer
change to side nav
SINCRONIZANDO AVANCE
minor bugfix in web_components.dart
minor bugfix in web_components.dart
test for example config on heroku
reverted usage of config.example.json
pagination of blog archive
removing unneeded files
Fixed some conditional bugs
JSLB as typescript module
* Changed presentation of editor dialog: now all possible fields are
  visible at all times; the ones that don't pertain to the current login
  type are disabled. This allowed me to make the window non-resizable
  and stop persisting the dimensions, which should eliminate problems
  with the window being too small because the contents have become
  larger.
* Added feature to rename "Saved Passwords" menu item for those who want
  to make it less obvious.
* Added option to always show passwords, including in the Saved
  Passwords dialog. Unfortunately, there is a dilemma regarding the
  master password prompt: if I prompt for it, there is a possibility it
  has already been prompted for immediately before; if I don't prompt
  for it, it probably won't get prompted for at all except the first
  time the dialog shows during a session. I leave it to the user to
  decide which is less undesirable but err on the side of caution for
  the default.
Added some incomplete locales.
* Made detection of login form field types case-insensitive.
* Added more locales.
Touch detection and more

- Added the artwork files, for the colors of some
- Add touch detection to the items in the bar
- Animated removal of items
- Made the barView and itemViews public properties
Merge branch 'master' of github.com:depl0y/Stacked-Horizontal-Bar

Conflicts:
	README.md
Quatrième partie de la re-rédaction ducode
added Brian LeGros copyright header to source files of HTTP Stub classes
Change contructor param order in test file
Create el-GR.tpl_warp.ini
foutje weg
remove .app_generate
fix unpublished icons
added delaunay; started on non-constant density
Fix for zero tone/last tone
Updated version number to 1.0.0a1.
Added instructions to download dev.db
Merge branch 'master' of github.com:dserban/WebDevCourseMaterials
Interface melhorada.
Cleaned up the code and fixed pylint errors
fix absolute imports and define a main in examples
Merge pull request #12 from nlhepler/master

Fix absolute imports
Fix memory leaking in the VM

Doesn't correctly free the resources before return

original change id If7de75c1780f4240ee21bc536cc739de4729cd98

picked from:
https://android-review.googlesource.com/#/c/23248/
initial project and aptana settings"
Add exception when environment is not injected yet
Adds a new data type for development
Adds pagination
Adds dynamic sorting by type
Fixes typo
Fixes pagination and display bugs
added tag 1.0.2
Merge branch 'master' of github.com:evernote/evernote-sdk-android
-update keymap
AppMetrics client update
Added new page/controller for Donations. Added styles and functionality
Merge branch 'master' of github.com:fdibartolo/LaBoletaNoSeMancha
Added dropdown on community view in order to show ranking by week. Adding 'loading' under groups
Merge branch 'develop' of github.com:fdibartolo/LaBoletaNoSeMancha into develop
width - usuario
鼠标提示装等、天赋