labofsahil/github-event-dataset-2012 huggingface dataset:
#2
Merge branch 'master' of
https://github.com/hedgehogtom/pythonappenginedemo.git

Conflicts:
	helloworld.py
Vaadin 7 version should work now
The project_id is now passed as a parameter to comments. This parameter is needed for linking back to the issues page.
Added project_id ro HttpResponseRedirect call to match new url mapping.
Added project_id to hyperlink that redirects to related comments.
Added comments.html template to project.
Uniformed Search
Now translation strings found only by lang not all scope
Testing php version with ssl and standard /usr/lib-config

Signed-off-by: Inge Thorud <inge.thorud@gmail.com>
added bootstrap and bootstrap-dropdowns
added bootstrap and bootstrap-dropdowns
added short-term links for apps
Small fixes, to make JSLint complain less
Merge pull request #367 from ajgon/dev

Just a quick fix to make this plugin JSLint compatible (correct branch)
Merge remote-tracking branch 'upstream/dev' into dev
replace python csv download script with shell script using curl.
added header to directions
try to get PYTHONPATH working
A better super snippet with the help of some vimscript.
Added DebugRun.java to the solution.
Added DebugRun.java to the repository.
adding authorship
Merge branch 'master' of github.com:johnfonte/BarracudaHackathonBot
Colocado
Actualización de Manifest (launch_path)
update
Merge branch 'master' of github.com:justmao945/justmao945.ruhoh.com
wait for new version of rss.rb, issue 103
read more adjustments
Initial import.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge remote-tracking branch 'origin/master'
modified to use create date rather than modified date
TaskItemClass fix.
auto-commit, updates submodules at 2012-07-18 02:11:42+00:00
ajout de commentaire, désactivation du mode débug, ajout du fichier .htaccess
null boudnary check
Dynamic adding (conceptually and visually) of both lectures and parts (supported on the backend)
Try to make it deploy #2
added baseurl mapper
Doc improvements for per-mapper configs
Applied suggested fix for Windows CSS bundles GPRESOURCES-120

Seems like the flush() that left the file open for write caused problems on windows when the second Writer is created. Closing both times apparently fixes this.,
Fixes for bundle reloading GPRESOURCES-124

Obscurely, the original problem was related to a bug clearing the processed.by.XXX attributes and also failure of bundles to know if their resources have changed (their dates are up to date if they have been reloaded)
Fixed relateiveTo where target is in folder under base GPRESOURCES-121
Updated version and docs URL
Obsolete file
Fix for absolute r:img links being broken GPRESOURCES-130

This should also fix some hidden bugs where absolute URLs are incorrectly looked up as resources
Updated version to 1.1.6 for release
Added more helpful output when error occurs if disposition has already been rendered
add info log message when reloading is done
adding a couple of other places where we need a finished log.info to match the start message
Fix for bug GPRESOURCES-137 which prevents the plugin from bundling javascript when running under Jetty.
Validation fix for GPRESOURCES-153
Merge pull request #10 from tomaslin/master

Base Url mapper and spock tests
Fixed addDispositionToRequest method call error, merged in and updated Tomas' base url mapper
Merge pull request #14 from tednaleid/master

Add a log message for when resource mapper is done
Merge pull request #15 from aiten/master

GPRESOURCES-137 fix.
Add Paul Beusterien and his OSCON PhoneGap Talk to Events list
Readme update and js clean.
uva 10305
try of Counter
Django1.4 with USE_TZ=True needs timezone aware datetimes

Conflicts:

	notification/management/commands/remove_old_notices.py
add git ignore
can now post reports both in json & xml, open311v2 views are also api_key protected
Fix broken references
Update relative performance section
Merge Maciek's conclusion changes
updates
improvement
Tweet length calculation is now properly taking into account URLs in the message.
Quick fix.
Se añadio el metodo atacar al personaje
asd test #100500#2
asd test #100500#2#3
asd test #100500#2#3
adding google ana
Changed Email Sender to 'Cisco Developer Network Notifications'
from 'Liferay Workflow Notifications'
..aktualisierte files

Signed-off-by: patrickjost <patrick.jost@students.fhv.at>
remove "Bell Character" (octal 007) from end of haml layout template
Added install instructions and configure script.
changed "goodbye" to "goodbye world"
Made it work on pre-escaped HTML; some fixes.
[app] Update media query to target smaller devices.
[app] Remove unused Cordova logo.
[app] Add config.xml
built binary
Fixed some chekstyle errors.

Change-Id: Ifc315e82e1633f512bff18f0ef01cbe9155994e8
Signed-off-by: Kiryl Parfiankou <Kirill.Parfenkov@gmail.com>
Added new files to set parameters in one file and run from a central location
update todo
Added methods to create random bitstrings and orgs
Expanded higher level running
Final tweaking to make parameter calls work
Merge remote-tracking branch 'jared/master'
Merge remote-tracking branch 'josh/master'
Merge remote-tracking branch 'jared/master'
Rewrote param_parser to not be dependant on lineno
Practicing with decisions and objects
new build_number=120107104 and uuid=94b292ea98c3a9b65a5e1c52a2fbf941
Merge remote branch 'origin'
new build_number=120107105 and uuid=4eb7ac99c7695bc0efad6ec668851336
.rvmrc corrigido
Removed extra column in datagrid.
Tarefa #1 fechada.
working to append details
adding in coupon framework
fix bug on stream transport http layer when headers are sub array of wrapper data
Adding JMail::IsHTML and have it return  for chaining. Includes tests.
renaming to JMail::isHtml
Address issues in JHttpTransportSocket when the requested uri does not exist.
Removing the code style from the Platform repository.
Merge pull request #1633 from dongilbert/jmailfix

Adding JMail::IsHTML and have it return $this for chaining. Includes tests.
Adding the coding standards as a submodule.
Shuffle PDO isSupported check

At the moment a bit of work is done before the check for PDO checks
if it is even supported. This shuffles some code around to move the
checks further up the file.
Support configurable facilities for JLogLoggerSyslog

At the moment JLogLoggerSyslog is hard coded to user the "user" log
facility. For Windows this is the only log facility available to the
PHP syslog command however for every other system with standard
syslog support there are alternative options.

This change permits specifying other syslog facilities through a
`sys_facility` option. The facilities supported are listed here:
http://us1.php.net/manual/en/function.openlog.php

An example of code which utilises this feature could look like this:
```php
// Set up syslog
JLog::addLogger(
	array(
		'logger' => 'syslog',
		'sys_ident' => 'jplatform_app',
		'sys_facility' => LOG_LOCAL7
	),
	JLog::ERROR,
	array('databasequery')
);
```

That example logs to `LOCAL7` any database query error with a custom
identifier.
Merge and code style clean up
Update docs/coding-standards/en-US/chapters/php.xml
Update docs/coding-standards/en-US/chapters/source-code-management.xml
Merge pull request #1431 from elinw/socket

Handling in HttpTransport when the requested uri does not exist
Merge pull request #1637 from pasamio/pdo_shuffle

Shuffle PDO isSupported check
Merge pull request #1638 from pasamio/syslog_facilities

Support configurable facilities for JLogLoggerSyslog
Merge pull request #1636 from LouisLandry/style

Changing the PHPCS standard to use a submodule.
Fixed remaining OAuth test time issues.
Merge pull request #1641 from ianmacl/oauth_test_fix_again

Fixed remaining OAuth test time issues.
Add default prefix property to password

Add getDefaultType
Updating coding standards.
tidy up the notifications and send updates for work items as well
updated notifcations so just the one is sent and dont get dups
remove the client filter on todo
Fixes from laying out parts on paper
After the storm, there is silence...
Mergey mergey mergey
Update README and CLI help

- Provide more verbose help for config options
- Suppress deprecated options from help
- Updated options & docs in README file

Change-Id: Ic0dc2575a15f2cff513c5013266e8f8112e167a2
Merge "Update README and CLI help"
Rename ItWithMetadata to SpecWithMetadata.
Merge branch 'master' of github.com:ordinaryzelig/minispec-metadata
Update vendors/Rakefile

updated to current processing beta
README complete :)
Firemanagement Application support has been added.
add http first
Revert "bugfixes"

This reverts commit bf712691afa6ce2ae09c69750547cc69d4ea5246.
span for switch locale
CardsShow: fix
Add transform modifier.

Add a modifier to apply a general function to the return value of an
`Option`.
Tweaked the interface
Whee! Documentation!

Bad documentation, but documentation all the same.
Tweaked .gitignore
Locations kleiner
Changed the way state is stored in Tree
sorting presentation images
Action menu self-contained, and removed required metadata
Self contained banner, and some indetnation nits
Object menu self-contained
Prompt self-contained and edit mode export as separated component
Merge branch 'master' of https://github.com/basiclines/Gaia-UI-Building-Blocks into selfcontained-menus_dialogs
isolated value selector single/multiple
Isolated time selector
Self contained date selector
Removed un-necesary files and some nit fixing
Nit code fixing and imageOptim passed in all the menus_dialogs images
Merge pull request #41 from basiclines/selfcontained-menus_dialogs

Selfcontained menus dialogs
Merge remote-tracking branch 'upstream/master'
"buttons, headers and switches" Building Blog
Earth Touch - Nice try to hide the real Vimeo links
NBC - Default to type 'Clip' if clipContentType is not available.
CBS - People keep trying to add non-video pages to their queue.
Yahoo Movies - Use regex instead of xpath, because xml is broken a lot due to ampersands not being written as &amp;
Handle the case when the streaming URLs are no longer available
Merge pull request #380 from IanDBird/SF

Handle the case when the streaming URLs are no longer available
Link to John Bender
Fix bug with jqueryUi 1.9
Implemented base for unit testing.
Implemented the unit test case for the configuration toolkit.
Implemented unit test case for the configuration container.
Implemented unit test case for the configuration loader.
Modified the data type for the construct argument, no need for WordPress-prefix.
Implemented unit test case for the view.
Implemented unit test case for the class autoloader.
Added the GPLv3 license text.
Modify the visibility for Cache::generateName and added type casting for expire argument.
Implemented unit test case for the cache handler.
Changed Readme based on Sande's comments
Refactoring contact us
fix templates classes
Updated the adt.js library
In the chain function signature, this should be passed through to the function body
swap over the progress number to stop it jumping around
install joda time in all branches so I don't need to restart grails
Merge branch 'refs/heads/1-standard-scaffolding' into 3-customize-type-input
minor comment.
Merge branch 'master' of https://github.com/robotics-in-concert/rocon_comms
adding pulled interface for remote gateway info.
maybe we need ros_comm as a stack dependency.
Traduz para pt-BR 07-01-01-Security.md

Signed-off-by: Rogerio Prado de Jesus <rogeriopradoj@gmail.com>
dev.sh is used when setup.sh failed, and wont recreate a key etc
Now obfuscator is correctly renaming subclasses methods according to
super classes renaming :)
Crap::croak doesn't work; strange... it looks right
Wrap croak with a class method to add class name

and avoid typoing "Carp" as "Crap"
More slides, update hello2.
Add FantasyClient class
Fantasy client test case shows how to make requests
Fixed null results, returns RHNull
pass command line arguments to http client
rebuild.php command line switches (--quiet, --board, etc.)
removed console.log() call
improved error handling for chrome extension: if connection fails it shows an "err" badge
renamed chrome extension
changed permissions in chrome extension, localhost is sufficient to reload page
removed console.log() call
improved timing reload
added readme text about this plugin and licence
fixed Twig dependency
modified:   css/scrumble.css
	modified:   html/projectHome-module.html
Merge branch 'master' of github.com:scrumbleproject/scrumble-client
Merge branch 'master' of github.com:scrumbleproject/scrumble-client
Merge branch 'master' of github.com:scrumbleproject/scrumble-client
Merge branch 'master' of github.com:scrumbleproject/scrumble-client
Merge branch 'master' of github.com:scrumbleproject/scrumble-client
Merge branch 'master' of github.com:scrumbleproject/scrumble-client
Import JSON
isaac_variant_caller_workflow-1.0.0
chenged the files of people controller from erb to haml
Site updated at 2012-08-05 16:00:34 UTC
rake was introduced
Rakefile updated. templates added.
Rakefile updated.
conf.yml.example added
Rakefile updated
Order actions by where they act on the page

Group by page section top to bottom (header/search box, ads, footer)
Add better separators between ads
Updated linuxconfig
Added examples to the README file.
[maven-release-plugin] prepare release v1.5.2304
fix line widths
Projektskizze

Geordned und umbenannt
Beispiel Feld gezeichnet, Figuren hinzugefuegt, alles statisch
Merge branch 'master' of https://github.com/sprengmeister/IT10-t_SWE1_chess
I think Google Maps on the Voter is working now. The problem is that the default grails template prevents the Google Maps div from rendering. So, the Voter show view is just plain HTML for now. We need a damned UI person. -SS"
"
Update notes for submitted changes

* Update mysql version to 5.5 for builder.
Benchmark alternate implementations
add uc variables
changing loop with control
Better Auto Update

Added a notification bar to display when a new version is released.
updated make to be more backbone compatible and reformatted some of the radme
Added better error handling for missing  and updated documentation, Closes GH-141
undid intentional error in example for testing
updated to fix afterRender issue
Added exception handling weather;

Change-Id: I803f0bfa4d9c8eda6a140dc09fb0e96ace28181d
Fix egrep to be smarter about tr line errors
Refactored the updateRates method to the StocksViewModel. Setting up code for autosuggest of stocks.
#2 Rename [Definition] attribute to [ObjectDef]
rename <contect:code-config/> into <context:component-scan/>
#6 #7 Renames code-config to component-scan. Added base-assemblies attribute to filter assemblies to scan.
#8 Add possibility to filter type class name with regexpression within XML element <component-scan>
#8 Add possibility to attribute filter for including or excluding component classes
#8 Add possibility to filter types by assignable, either implemented interface or extends a specific base type
#8 Add possibility to have a custom filter which implements ITypeFilter
changing position of departaments cea page
change image from cea page
fix margins on buttons
Refactor view and css code around homepage links

This adds a new class to the body which we can use to do more styling
in CSS rather than erb-embedded Ruby. The only visual change is that
there's now a subtle transition for homepage links becoming active.
Move rich text support code into a separate file
Use the jQuery data() function to access HTML 5 data attributes
Use named routes in the layout
Remove controller_action class from the content div

It's duplicated by the new controller-action class on the body
element, so just use that instead.
Float the user image right in the global diary list
Een aantal knoppen gewijzigd
added clarification in comments
Merge branch 'master' of github.com:uberVU/coffeescript-style-guide
tweak place data attribution
Convert README to markdown file format
study04, study05 and study06
Comienza la rama ChartWidget con las clases correspondientes
Clases correctamente agregadas. Tambien se agregó el ui para manejar
esto.
ups, casi borro el ui principal
Interfaz ya con el tamaño correcto y los primeros botónes
Agregadas las imágenes de de remover y ver (primeras versiones)
wq_chart_widget completo, por lo menos en apariencia, falta conectar las
señales y los slots.
A bit on monoids, mostly structural work.
Lockscreen weather: option to invert low/high temp display (1/2)

Change-Id: Ie693e3ab0b52d3034b516635c45dba4730b61160
fix build, by adding @hide to android.provider.Settings.System.SAFE_HEADSET_VOLUME_RESTORE

broken by : http://review.cyanogenmod.com/#/c/16445/

Change-Id: I8cc948084e8e92e7052508d5de322ca5bb08b03b
Allow HTC cameras to incorrectly report wrong framerate
Signed-off-by: vorbeth <vorbeth@gmail.com>

Change-Id: I84bc2e6ee030bd2904a6ff5022d430ff9556ea35
cgg url element was wrong
Adjust velocity template for global license overview to list
used licenses and group development components and associated archives
under the respective license (list them as many times as different
licenses occur).

Change-Id: Icf60b622db302b959159043ec90f0b21c4383b6d
Added local DB
Merged master with DetailBox
Minor trace fixes and parts list.
wyswietlanie nazwy uzytkownika zalogowanego
Merge branch 'master' of github.com:wojciech161/projekt-konsultacje
ajax.php änderung
text-layout
Big AI & HUD update

Changed the AI and added a HUD. Also added formulae for calculating XP
to level, as well as increasing player HP per level as well.
css theming successful, downgrade to 3.1 for repo-ing
cedartrail: add missing gst-va-intel-vaapi machine feature

There needs to be a gst-va-* MACHINE_FEATURE to get the right VA elements in the
images.

Signed-off-by: Ross Burton <ross.burton@intel.com>
removing JB references
Add shutdown/restart watchdog timer.
zSpawn shadows default to new AI, as "tanks."
Instrument usage of persistent storage.
SVN Update# 4315
update match and customize the anything-ack, which also turns out to
be very useful
Merge pull request #1 from BBC-Knowlearn/master

Pulling changes
fixed some syntax errors and updated gem
Merge pull request #1 from kenoir/master

Just fixing some syntax errors
f/b: fixed typo and updated romanian translation

Change-Id: I8f414319913cbf52cef29441b2d0429621daa565
Signed-off-by: Igor <igor_sorocean@hotmail.com>
Quick Settings:  Make Lock screen drawables consistent

Credit to Björn Lundén for drawables

Change-Id: I77d1b5072484eb1c0ea0c28a2eb88ef0f75e327d
SistemUI: updated romanian translation

Change-Id: If19e447bfe0e497c1842700de5e6f3bf53fbfac9
Signed-off-by: Igor <igor_sorocean@hotmail.com>
pt-rPT: Fix too long on/off text for setting toggle. In Portugal the international ON/OFF is prefered, and the previous values made the toggle way to large.

Change-Id: I3f10c3ec12c861461178a5ecbf35debf8785bd55
Framework: Add NFC Tile to Quick Settings (2 of 2)

Need to figure out how to instantiate a new NFC adapter after the
Tile is created.

Change-Id: I5ad99f1ac8f4730653c9697c2c0d0e86b7d4facd
Merge "pt-rPT: Fix too long on/off text for setting toggle. In Portugal the international ON/OFF is prefered, and the previous values made the toggle way to large." into cm-10.1
Merge "Quick Settings:  Make Lock screen drawables consistent" into cm-10.1
NfcTile: rename setState/updateTileState to setTileState. Submitting on behalf of dvtonder.

Change-Id: I9628e260acf10fb06523c7cb9362ae4eb34a057b
es_ES: Added missing translations

Change-Id: I263869442d722bf7185a0aaf4c09fb3be9deb8da
Merge "f/b: fixed typo and updated romanian translation" into cm-10.1
Merge "SistemUI: updated romanian translation" into cm-10.1
Framework: Cleanup Quick Settings Sound tiles

Change-Id: I45ba7098ef8c58a6e8e232abaa16780cab2df186
Framework: Add Screen timeout Quick Settings Tile (2 of 2)

Change-Id: I02a7866c83bc9a914ed8bfad12872d5ed1a854f5
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD
Added rendering tests.
Initial recommit from backup
Trying to add the Android files back in with little success recognizing it in Eclipse.
Moved project folders up one level in the directory.
Eclipse still refuses to load the android project
.
.
.
.project still showing as missing, no resources online to help make it visible again.
,
Attempting to rollback to before Android project lost ".project" and therefore couldn't open.
Deleted duplicate project sub-folder
Replaced old android project files from backup
Still trying to import existing project into workspace but it's repeatedly failing for no reason that I can identify anywhere.
Updated main.js and index.html for android version
Android app still not loading properly, only showing a "Hellworld, AddingtondemoActivity!" blank screen
Committing odds and ends to sync with web.  No major changes for this commit.
navigation instructions in demo
Added Jpeg version of button(better looking)
Cocoon, CSS & general
Resized Images to fit Mobile Skyrim Character Creator
Added post saying I'm under construction
Greek phi
Merge branch 'MergePoint1' into MergeTest
Baseball
MergePoint2 Commit with conflict resolution
Merge in master with conflict.
Add commit with conflicts. Mock bug fix on feature.
Merge branch 'FeatureTest' of github.com:DoubleLinePartners/DLP-Play-Area into FeatureTest
Newt-picking and a library
Correct analizza_fo() and added modified intestazione()
Support downloading a standalone build
Try testing against multiple activerecord versions using Appraisal.
削除もれを削除
- Qt 4.8.0 for Windows
- cleanup
RussianPassport -> InternationalPassport
adding paralax stuff
Patch to build with newest 0.6.0-snapshort jrebirth version
Applying pull req #47 to D7.
Correcting for erros on settings pages for all.
Correcting for erros on settings pages for all.
t385 - Adding message on sustainere charge failure.
Site updated at 2012-10-09 15:11:57 UTC
opp bugfix: remove label at the end of for loop

Change-Id: I474cb1d06e400caa3d64a4dc4ca25ba119a41f94
Arquivo README editado.
preprod buildout
ignore sublime fiels
resolve sublime ignores
Moved :combatphase to correct function.
Hopefully fixed UCMG killing other player's turrets.
première version vraiment fonctionnelle avec bundle install
Merge branch 'master' of github.com:MichaelHoste/rails-setup-vagrant
Make TimeSpan format configurable
Add in worldload tick
update rvmrc file
Initial (testing) commit.
Fixed Undefined Variable Notice
fix crash bug of mayaViewer with edgeCreases
Putting the Pollenizer into Twitter
new page

logo
dont

now
Use Appraisal to test multiple ActiveRecords
24-04(2)
Trying to get stuff to actually compress.
idk wth is going on....
Right where I want it.
Not sure what the last changes were.
Going to do something crazy
Mostly working.
I think I am done for now.
github failed on rendering the markdown
Fixed issue #22, the driver column is now added on update and on data table creation
- corrections des bugs sur la montée du blocage et frappe de la dernière chance.
Allowed for adding of any Field by Field Name
Collisionmap redone
Nog een beetje anders
initial draft of v2.1 release notes
Merge pull request #60 from tortosi/master

Testing the videos and more that are made from tortosi.
If not working, will be removed.
tidy html code
lpaplayer: Shush the verbose logging

Change-Id: Ibe79766449acafab0598abd46555c65a9251e011
Add building construction in useCard
Merge branch 'master' into ss
Refactor construct bulding
Merge branch 'ss'
get rid of this darn file
Added a way to iterate through combinations of the campaigns.
Trying all combinations, skipping invalid ones, and finds answer.
New exceptions, more tests, minor fixes...

delete without params, IDEquality constant...
Really professional for an officially linked repository

The upstream version of this repository is linked directly from the
"official" PhoneGap site, and these guys can't even write as though
they have manners. That is wonderful.
変なエラーができたから作り直し
"Envoyez-moi un e-mail" instead of "Envoyez-mopi un e-mail"
Bug fix regarding IN operator
graph plot changes for text type questions
Fixed supported metadata version detection
Corrected epub stylesheet for pandoc
Added specific epub stylesheet
Line height was not set correctly
Merge pull request #160 from Alex-PK/master

Added a specific stylesheet for epub version
fixed sorting bugs, added more testing method and pretty completed the exercise.
some final testers to test searching through the collection
Looks better without the text-shadow.
Use moment in place of Date in viewDate.

Also:

* Refactor to remove duplicate
* Throw the changeDate event iff moment change
* Enhance view on null value
* Allow set value externally with set method
Site updated at 2012-04-04 13:17:46 UTC
StatUser Authenticate
- first draft flooding
Site updated at 2012-12-24 18:40:13 UTC
Jon: Argh, missed a css file
fixed time format issue on save and changed js so that it detects daylight savings time zone
Added max count for requests to fakester.biz at a time
So that's why that was set
Update guide/bootstrapping/bootstrapping_hp.textile
modified database.yml to my liking
Merge commit 'cb1db2e3afadc251c6cbaff93b9119c214f07812' into bensbranch
augmented .gitignore for swap and DS files
Baby steps for jQuery mobile
Fixed yield of page attributes to stylesheet
Merge branch 'development' into bensbranch
merged development
appended .gitignore
updated Gemfile with new versions and test gems
setup for spork and guard testing
eliminated binding.pry from a spec
Merge branch 'bensbranch' into development
Add significantChange documentation
added ignore for build folder, added delegate respondsToSelector: checks for tap gesture
added useShadowing and allowPinchRotateSwitch flags (you can now turn off the default shadowing and disable pinch/rotate gestures), PSPushPopPressView works properly now if it is used inside a nib file
Merge branch 'master' of github.com:jlalvarez18/PSPushPopPressView

Conflicts:
	PSPushPopPressView.m
added rasterization to layer when doing pinch scaling to remove jagged edges on images and the such
added saving and restoring of initialTransform
fixed issue where if rootView is a UINavigationController it would return the incorrect size that includes the status bar
added bounce delegate methods
fixes shadow bug
Declaration of two methods in header-file to override in subclass
Update project settings
Add possibility to disable gesture recognition
Detach to window even when animation isn't finished
Ignore finished parameter, seems to behave better
Merge branch 'master' of github.com:NOUSguide/PSPushPopPressView
Merge branch 'master' of github.com:dreipol/PSPushPopPressView
Merge branch 'master' of github.com:jlalvarez18/PSPushPopPressView

Conflicts:
	PSPushPopPressView.h
	PSPushPopPressView.m
Resolve merge problem
Clarifies vacation policy for how things are now
Adjusted redirect template
merged changes
Added Angel Sanchez Morales
Added Josep Maria Herrando
Listed Individuals as such
Adjusted title for each section (Corps / Individuals)
Made invisible list of individuals per corporation
Merge pull request #51 from pelegri/master

Added Contributors; Improved layout
Added Restaurant Locator tutorial
Added Nutrition Tracker tutorial
Merge pull request #3 from blackberry/tutorials

Adding Tutorials
Added canvas animation section
VIPs can use /warp now
added freebuild rules
Added shops page, updated faq, added link to minecraft-server-list.com
Added link to shops page
Site updated at 2012-10-12 13:52:31 UTC
+ foursquare
code cleanup, AuthorUseCases
ie tweeks for social media icons
Optimization in addRemoteImage()
No need now to load jsjpegmeta at init, as it is only used in the web worker, which loads it separately.
Refactor image preview functionality
Site updated at 2012-10-01 18:25:17 UTC
gnu header
Merge remote-tracking branch 'upstream/jellybean' into jellybean-cm
Merge remote-tracking branch 'upstream/jellybean' into jellybean-cm
Enable Tablet -> PC connection in 'tablet' UI
Let SystemUI route HDMI audio
Merge remote-tracking branch 'upstream/jellybean' into jellybean-cm
revert HTML5 changes
Merge remote-tracking branch 'upstream/jellybean' into jellybean-cm

Conflicts:
	core/java/android/webkit/HTML5VideoFullScreen.java
Send fake deviceID because we don't have a radio
Merge remote-tracking branch 'ct/jellybean-cm' into jb-a10
wbackground-image: -webkit-linear-gradient(#F8F8F8, #EAEAEA, #F8F8F8);
Use never-default to true by default
Fix template for OpenVPN
implemented chiSquareTest
Added post about cURL
minor fixes to make html tidy happy
partial work on community section
incremental checkin
merge upstream and add community section
remove cache files
disable CNAME
add community section
fix CNAME
Merge branch 'gh-pages' of https://github.com/thoward/cascadiajs.github.com into thoward-gh-pages

* 'gh-pages' of https://github.com/thoward/cascadiajs.github.com:
  fix CNAME
  add community section
  disable CNAME
  remove cache files
  incremental checkin
  partial work on community section
  minor fixes to make html tidy happy
Cleanup.
Bugs
Merge branch 'thoward-gh-pages'

* thoward-gh-pages:
  Cleanup.
  fix CNAME
  add community section
  disable CNAME
  remove cache files
  incremental checkin
  partial work on community section
  minor fixes to make html tidy happy
adding my photo
Merge pull request #31 from glennblock/master

adding my photo
added email to users.
Testing app post fix
Fixed NoMethodError.
Testing login.
Fixed not returning user.
Fixed wrong id.
Fixed inaccessible method.
Testing without facebook update.
testing fake password
merged
Merge branch 'appFix' of https://github.com/charlesmunger/friend-app-matcher into appFix
Merge branch 'appFix' of https://github.com/charlesmunger/friend-app-matcher into appFix
fixed
Merge pull request #1 from charlesmunger/appFix

Posting from android app now works.
server config script for centos, incomplete
RunLim
[IND-866] merge and rename EDBTrigger
added support for separate directories
liblights: Fix touch key lights coming on when screen brightness is adjusted

Only tested on GT-I9100

Change-Id: I2be3c5ce74799bea310a65bc75dd90985b9d17d6
exynos: reorganized and updated from insignal

Changes needed on exynos4210 devices:

libcsc -> libseccscapi
libswconverter -> remove

TARGET_HAL_PATH := hardware/samsung/exynos4/hal
TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax
$(call inherit-product, hardware/samsung/exynos4210.mk)

Change-Id: Ic59ef95b85ef37b3f38fb36cf6a364a5414685ee
Android.mk: only include directory for exynos devices

we should play nice with other devices that have there own libraries with the same name

Change-Id: Icf208e38094e4317d3546578176ab149a4e4b5b9
exynos: Improve H264 encode quality

Change-Id: I0c184daecffe644445c759deeeb8895f69c1755b
liblights: adjust file location for smdk4210 kernel

Change-Id: Ib66a360729d25619b4270f081659b18e18437be3
Add Red/Blue LED notification support

This will allow the use of the red/blue led's on the sph-d710
Uses BOARD_HAS_LED_NOTIF in boardconfig.

Change-Id: Ic217ed5b0ec673d03bb596fbde0ac725a5ca0887
codecs: mfcapi compatibility patch for exynos4x12

Change-Id: I2fe0d481506d374e8fa6a71b56d4dddee3f132b1
codecs: build shared mfcapi lib on exynos4x12

Change-Id: I8a09f8e6e86191197f0382e5c40e6acd16f33cda
exynos4: hdmi: fix invalid conversion from void* to unsigned int

Change-Id: Ib81076f7f85719cd7bc318d45a0b176211b0ee89
Bump version for unreleased changes.
Update notes for submitted changes

* Translate quota check sequel validation exceptions
* Enforce quota check(s) in service instance model.
* Prep org model to implement quota checks.
Add c.psc.*
copy marker interfaces from real request to fake request before resource view lookup to enable browserlayer-based overrides
only index file.
Add create offer feature
linefeeds beware!
normalize linefeeds.
Re-add CNAME...
Add exception for CNAME - it kept getting deleted from GitHub Pages
removed jackson long duplicate image
removed jackson long duplicate image
Merge branch 'master' of github.com:dailyemerald/EMG-Wordpress-Theme
output current template used to generate to javascript, bootstraping a JS tracking call later
Decimo noveno test exitoso
Set version to 2.4 to match twitter-tools version. Avoid confusion in wp-admin interface.
Change typekit loading to async
Moved doku.php to doku.php/index.html to avoid nginx from returning a PHP content-type.
Private key injection
Function for linear_regression.m
Add migration for importing the barclamp
Merge pull request #5 from galthaus/pull-req-release-rails3anddb-master-7b12adaba9

migration pull requests [24/29]
Ignore dmalloc/dmalloc.
Added boost process and newer boost library version.
Update .gitignore to ignore boost build outputs.
Accidentally gitignored a necessary file.
About to sync macport with dev
Fixing loadurl Java->JavaScript comms problem which causes keyboard to close
* loadurl replaced with sendJavaScript
* UI updated to contain textarea and my-event data contents

Conflicts:

	assets/www/index.html
	assets/www/js/app.js
	project.properties
Merge latest from Pusher (27dad5a3e)
uncomment updating - keyboard no longer disappearing thanks for fix from Pusher
audio with reference
updated gitignore
first shoot at channel reading for iterations
Fix targets to be more specific
Base implementation ReminderRepository without tests
Update reminder after task moving(reassign)
Merge branch 'master' of https://github.com/dv00d00/BinaryStudio.TaskManager
Reminder view and some logic
Merge branch 'master' of https://github.com/dv00d00/BinaryStudio.TaskManager

Conflicts:
	BinaryStudio.TaskManager.Web/Content/Custom.css
	BinaryStudio.TaskManager.Web/Views/Reminder/Create.cshtml
	BinaryStudio.TaskManager.Web/Views/Reminder/MyReminders.cshtml
	BinaryStudio.TaskManager.Web/Views/Reminder/_CreateOrEdit.cshtml
fix tutor08
Site updated at 2012-08-01 22:48:41 UTC
added a View Template for form generation
... edit post
Signed package
PLFENG-1099 : change blessed to exodev for exodev repository
Added some files to gitignore (.classpath, .settings and .project)
Refactored GmondReader
Added Mockito dependency
Refactored and overall cleaning of GMondReader code. Addition of tests
for it.
- Removendo chamada do metodo get do cliente;
update readme
update project
update repo
md5checker.py: improve the help text printed for -h option.
md5checker.py: cosmetic update to usage information for -d/--diff option.
md5checker.py: normalise file paths when outputting results of MD5 computation.
md5checker.py: be more verbose when performing directory comparisons: summarise what will be done, and what actually happened.
md5checker.py: fix formatting bug in verify_md5sums function.
md5checker.py: enable --diff option to compare two files as well as two directories.
md5checker.py: enable MD5 sum generation for a single file as well as for a directory.
md5schecker.py: update help text for --diff option to clarify that it works for files as well as directories.
md5checker.py: removed -v(erbose) option and replaced with -q(uiet) option.

Program now produces verbose output by default, unless suppressed by the -q/--quiet option. Errors and failures are consistently written to stderr.
md5checker.py: program exit status reflects success or failure of requested operation.

Returns 0 on success and 1 if any failures were encountered.
md5checker.py: update version to 0.1.0 and revise README entry.
Edit github plugin
debug
debug
Merge branch 'master' of github.com:francisengelmann/SensorLab2_1337
added: folderView UI
adding missing php classes for samba hash creation
Create 2012-12-21-error-github.md

g
modify ads
Assorted minor bugfixes.

* Fix several variable assignments leaking into the global scope.
* Fixed several improper uses of `for in` loops.
Fix subscribing to threads when the URL has a hash.

* Strip the hash from the URL when subscribing to a thread.
More bugfixes

* More global variable fixes.
* A bug fix in date diff formatting.
* A few pedantic fixes.
Merge branch 'master' into bugfixes

Conflicts:
	lib/reddit_enhancement_suite.user.js
Merge pull request #118 from gamefreak/bugfixes

A bunch of last minute bugfixes
Merge pull request #119 from gavin19/master

Typo @8823 - valeu/value
padding css change
Merge remote-tracking branch 'origin/master'
a few minor bugfixes
a couple more minor CSS fixes
couple more very minor CSS tweaks
minor housecleaning... sprite sheet update... almost ready!
a bit more triage, a couple safari specific fixes
positioning fixes for account switcher dropdown
quick opera CSS fix
fix for firefox bad APIURL calls on saving links
fix for macros not targeting proper textarea
triage for subreddit button placement
Add visibility CSS property to forceVisible
Version changed
Version import finished
improved while unit test
improved for unit tests
added for unit test "User" and external projects
unit tests improved and added
improved for new tests
Add internship project
README.md updated accordingly to the added new features.
Updated to 2012.03.13-651368
update to this.file api
Switching print statements to Python logging.
adding MapBox, Leaflet and Wax
google-plus image added
added squirrel small xml 
fixed playerentity compile error.
Algunos cambios
Algunos cambios2
Teste de Construcao
Redo the recursive method a bit.
added doc comments about custom babysitter lib
Updated Doctrine entities
Tables should have a sans-serif font
Working Doctrine and partially working PatientController
v1.1.5 - Fixed install method. Added uninstall method which deletes the wpnbh_options option. Using preg_replace in place of preg_filter for PHP 5.3+.
Update index.html

Re-edit of text to simplify.
Add draft text for new post
Working on displaying the team correctly.

This includes the manager name, team name and current salary cap situation.
Update miminum PHP version
adding back window objects
Site updated at 2012-03-31 09:21:03 UTC
JBIDE-10945	BrowserSim: create more skins
- created Android screen

git-svn-id: https://svn.jboss.org/repos/jbosstools/trunk@40185 a97e2381-89e5-4abb-bab3-167db6db766c
added style and fonts
test commit for katherine!
Merge branch 'master' of github.com:jdrizin/echinacea-project-scraps
remove debugging trace statements
Octopress init
Site updated at 2012-12-29 21:09:52 UTC
Refactoring Node internal variables to reflect changing understanding.
Begin working towards the attribute builder

The present means of generating a rolled attribute is one ugly bit of
code.
prep for real use, next step build the template
import
switch from svn to git
trigger build
trigger build
trigger build
use build url api xml to get changes
trigger build
fix name of folder
trigger build
adjust to move of templates to child dir
variables don't work as expected
remove switches that don't work with this old version of maven
specify the old version of maven in the template
remove post build step to name build svn rev
add config for creator job, not the best place in the world for this file
edit for new branch
allow forces, execute on new branch creation, error out when branch is not set correctly
edit branch name to not include the origin
add creator jenkins config file
hmm, not good, the feature branch dsl was merged into the next branch
opps, meant to ignore this file
怎加了 use-an-access-control-maxtrix
修改了 描述 '基本目标' -> '课程目标'
Adding refresh timeout management
Some updates to refresh timer
Merge pull request #104 from khawkins/oauth_refresh_timeout

Oauth refresh timeout
stupid osx files

ignored .DS_Store
added gitignore

duh
kata resuelta en ruby
Merge pull request #2 from hhiroshi/master

Yoseki 2012-06-lima by @hhiroshi
galaxys2: use opensource sensor hal
more and better validators
herokuized
prefix presentation with explantory slide
conciseifying the readme
removed trainingdata.txt
removed sampleTweets.txt
new logo and committing to the url
Из блока обнуления полей и отступов убраны редко используемые теги: canvas,  embed, menu, output, ruby, time, audio, video.
Для элементов HTML5 обнуление сделано отдельно, возможно, что это немного улучшит производительность.
messed around with staMa
deleted some files
Merge branch 'master' of https://github.com/laurita/SimilaritySearch-project
Cleanup whitespace and comments
Fix another schema error
run the app on build
Added method post with upload photo
exclude vim
test content
Deactivate unneeded ChibiOS features
Fix small type conversion error
Fix documentation
Get rid of blinker thread, can be done in main.
[MAESTRO-1866] more finite handling of 401
revamp...
First Commit

Signed-off-by: Oliver Godby <oliver_godby@me.com>
Merge branch 'master' of github.com:maleghast/clj-dojo-cog-april2012
Update db/migrate/20111117204614_devise_create_users.rb

Changed type
Fix passenger version in vhost config
Bare-metal *nix UART to MAVLink bridge example
Eliminated a tiny redundancy.
Fixed: Corrected pattern in services.ondertitel a bit more.
New: Removed multi-app support. Was a bad feature that added complexity to all applications in order to cover edge cases where someone had multiple applications under same framework core.
Site updated at 2012-05-26 19:49:41 UTC
Pulled out checkFunc and forbidden cells
update start function, use contentready instead of getElementById.
update start function, use contentready instead of getElementById.
Enable conditional type /encoding changes for file refs. Hack for property pad lag. Fix comment / dirty handling.
change title in _config.yml
Site updated at 2012-07-01 09:44:10 UTC
use the metlog timestamp for ISO formatting of time
forced the metlog_file output plugin to use the metlog client authored
ISO timestamp for prefixes
Merge branch 'master' into vng/iso_timestamps
Merge branch 'master' into vng/catchall_filter
updated rpm buildfile
added HDFS configuration documentation to the logstash-metlog project
added a README pointing to rtfd.org documentation
Merge branch 'master' of github.com:mozilla-services/logstash-metlog
Bug 755609 - Set B2G media cache size to 4MB r=cpearce
Site updated at 2012-05-08 15:25:55 UTC
just for now . get rid of those in the next iteration
appointment scaffold and full calendar
change parent version
fix merge conflicts
add git ignore module
adding kloudless link
Ngine blogging tool

This project provides a basic structure for blogging.
readme changed
More on Foldable
Added the security plugins.
Check if callback is function
deps management cleanup
deps management cleanup
deps management cleanup
Update torus.txt
added list items for improving efficiency section of testimony post
trying different tiles
reversing useless previous edit
edited title font - want something less cheerful
Zoom to area on click.
Provide sufficient contrast.
Adding ability to fingerprint files

Change-Id: If5f59588994ad17de56adffa0f64a1aab1ee2e1c
Reviewed-on: https://review.openstack.org/15514
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Add markup contrib module
Small changes to better run through jslint
I've added main header file which contains a class hp_int. In this class is a
list of all functions I need to implement.
Change instantiation pattern for event handlers from an unneeded complex one to a much simpler
Implement icon handling for toggle function
* handle deactivating of all icons when all points are spent
* handle activating of all necessary icons when theres a point recovered
  after all points where spent
Filter away some more shows/categories. Use xpath's text() to fix a problem with spaces.
Prepare Products.ExtendedPathIndex 3.0.
vb
13324 - 'rake' breaks on the mac

Changed 'sed --in-place' to 'sed -i' to unbreak build on the mac
13324 - 'rake' breaks on the mac

Update changelog
Site updated at 2012-09-05 08:55:07 UTC
Fix bug where external content was included in internal output.
delete CalendarGoogle.apk
Fix for checkboxes immediately unchecking when validated
Merge remote-tracking branch 'bdmac/master'
implement a HTTP end point to post to IRC

Usable like this from the command line:

    echo '{"message":"foo bar"}' | curl -H "Content-Type:
    application/json" -X POST -d @- http://localhost:9091/to_irc
Site updated at 2012-11-30 11:26:21 UTC
Site updated at 2012-12-03 08:38:53 UTC
Re-added elements with git clone instead
Rebase from 'upstream' @ version '1.9.0'
Trimmed the branch to only the wiimote sub directory
cat correct file
Renaming templates to use the model name as per class based view convention
Refactor updateVisibility, fix resume on audio focus gain if service was
not playing
Add Video and Banner
Interessantes pdf zu MAT
added e coli gres
Make event coloring css rule match more cases
FInished nesting button groups
Nested and decluttered buttons
Nested and decluttered carousel
Further updates
Site updated at 2012-07-13 18:20:20 UTC
rewrited Constants.h

#define
update dma
fixing a header
Further updates to use dynamic ports
Fixed classname
Merge pull request #1083 from WouterJ/fixed_class_names

Fixed classname
Add cmake build bot on Mac 10.7

git-svn-id: http://address-sanitizer.googlecode.com/svn/trunk@1397 3c3640eb-14a6-2bb8-0b94-e9e73afe33f5
encore: disable SmartReflex calibration for OPP5 when overclocking

It appears the SR class 1.5 calibration process itself is causing
problems for some users at the non-standard 1100/1200 MHz overclocks.
Disable the calibration process for OPP5, effectively locking the
voltage for that OPP to 1.375 V.
encore: bump OPP4 nominal voltage up a step when overclocking

This might possibly improve stability at 1 GHz for a handful of really
poor chips, and SmartReflex will ensure that it won't actually increase
the operating voltage for anyone who doesn't need it.
gpio_key: Workaround for BN home button resume
-code from the Nook HD
Increase LCD refresh rate
Remove MMC_PM_KEEP_POWER from wl1271 mmc interface

This was a workaround for suspend/resume issues with wifi on, which
appear to have been solved by one or more of the various PM patches
that's gone into the kernel since.  Remove the workaround, which should
reduce system power consumption in suspend.
Another Concerts Update
load some changes to mashTape - maybe
New post about version 1 release
Not sure if we're supposed to be updating this yet but....
use needed e

Thanks internets for finding my typos
Lab 4 is finished
Add user list and view pages.
Corrected If / If Not Statements
- 'if' must be closed with '/if' not '/endif'
-Changed font-size of <th>
Removed rounded corners
Removed rounded corners & made logo smaller
empty suggest
Add full date to first post
Fixed incorrect use of permission use declarations in manifest file
Added UI module to index
Added note about versions 4.2.1 to 4.3.2 should work
Add support for windows newline code.
Tweak to make global installer work and bump version number
add zen to sites all themes
pushing changes for batch/course mergers
applied to index's javascript fun.
Move to .nut file extension.
Adding CounterClockwise Code
Breaking out cookbooks
Update to V52 and Renamed to Afqt2006Bounded
Add cache provider
Bump dependency
Inject the CacheProvider
Add the locale parameter to the CacheProvider
Remove composer.lock
Rename "fallback" to "provider"
Merge pull request #13 from Baachi/cache

CacheProvider
Criando os projetos iniciais
mel-release; ensure we're using our mel_tar function

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Updated formatting preferences
Removed some unnecessary casting
More formatting
Renamed some functions
Removed some unnecessary casting
Fixed the message sent to the player about their time
Removed the IResponse interface - the Response class is an internal DTO and the interface on it is pointless - it has no behavior and is never mocked.
* Removed the IRequest interface - the Request class is an internal DTO and the interface on it is pointless - it has no behavior and is never mocked.
Separate out GetRequest and PostRequest - they have different fields (headers are only valid on post requests) and are used in different places.
Merge pull request #12 from AnthonySteele/InternalsRefactor

Internals refactor