labofsahil/github-event-dataset-2012 huggingface dataset:
hmac-sha1 bugfix for SSE2. Now passes Test Suite.
Add another test vector to hmac-sha1
undef set_key in otder to avoid a clash with OpenSSL 0.9.7's backwards
compatibility DES interface, at least on Mac OS X 10.5.8
Make episerver, keepass, pwsafe non-plugs.
pass_gen.pl updates for GOST, SHA2 etc.
wpa-psk big-endian fixes
Added doc/BUGS which lists the three formats that does not work with
big-endian, as well as the problematic mscash CUDA formats.
Improvement: more aggressive defaults on Nvidia.
john-1.7.9-jumbo-6 as released by Solar
Bug fixed: xsha512 and raw-sha512 opencl/cuda IRL
Merge pull request #46 from qqldd/magnum-jumbo

Bug fixed: xsha512 and raw-sha512 opencl/cuda IRL
Adjust LDFLAGS for clang targets

For non-debug targets reuse the default LDFLAGS, to make sure -s is added and libraries under /usr/local/lib and /usr/local/ssl/lib are preferred (like with other Linux targets)

This adds -lz to linux-x86-64-clang (only the 3 other clang targets included -lz) and makes sure all the libraries are specified in the same sequence as for all other Linux targets.

For debug targets, don't reuse $(LDFLAGS), because of -s, but use all the -L and -l options from the LDFLAGS in the sequence they are used for the other Linux targets.
Jihaa, Jester's dead
Merge pull request #47 from claudioandre/magnum-jumbo

Magnum jumbo
Add support for cracking KeePass 2.x files.
Get rid of BOM.
define REPORT_OPENCL_WARNINGS in bleeding after it was undef'ed in magnum-jumbo
Add support for cracking PKCS #12 files.
Use BIO_write instead of BIO_puts.
Add one more test vector in pfx format.
Temporarily removed schedule
Adds News lists to the Home page.

Also: (1) improves Home visual (2) adds "Order By" combobox option to
Explore section (3) improves thumbnails distribution.
added check mark image for property history page
fix typo in task
search results into partials and begin updating copy
change default zoom in addresses#show
change default sample addreses and do some css styling
added arrow and cropped check mark images
fix typo
merge with master
ignore apple .DS_Store files
Merge branch 'interface' of github.com:codeforamerica/openblight into interface
re-enable tests and work on progress bar and layout of the #show page
fix merge issues
don't show history chart in properties without histories
Merge branch 'interface'
optimized images with Yahoo Smush.it
Fixed maruku warning: Unclosed span (waiting for ["*"])
Merge pull request #176 from akira28/gh-pages

Optimized images with Yahoo Smush.it to save some bandwidth
[#34] should be checking for storage name

Signed-off-by: crynobone <crynobone@gmail.com>
First cut at a complete, ground-up restructuring of the whole project. Not even close to being done yet.
Get rid of all kinds of Growl preferences-related things - users should be managing app notification settings within the Growl preferences.
More Growl preference cruft.
Power-related restructuring.
Some notification and state-related changes.
Some state-related removals/comments-out for now.
Lots of code re-organization, new Growl.framework, started working on GSNotifier.
Overall code structure and style improvements, large amounts of implementation in skeleton methods, and a bunch of FIXME annotations. Removed the 'restore state' preference as well.
Somehow the Turkish localization didn't get added to the project a while ago. Fixed that. Also added Growl-related keys to Spanish localization since they were missing.
GPU detection fixed. Only special case hard-coded strings are the legacy machine ones now, since I'm not sure how to check the bus type of each GPU.
Move localizations into a separate folder to clean up the root directory a bit.
More file shifting for a cleaner source tree.
Get rid of old state class that's no longer needed.
Fix build issues after removing old state class.
Lots of _ prefixes for private ivars and methods.
More _ prefixes for private ivars and methods.
More _ prefixes for private ivars and methods.
A smattering of ReactiveCocoa to get rid of the obnoxious manual KVO, a bunch of localization of previously not localized strings, tons of constants, etc.
No need for essentially duplicate constants.
Better initializer style, get rid of old junk from app delegate that was commented out.
EXIF metadata to the response headers
EXIF can be turned on/off when starting server
Hypnosis to 60 acc in RBY
Changed around some of the text.
Enable creation of known_hosts
Insert country functionality added
remove exclusion of AntHibernateToolTest and comment the testQuery test as that is the one causing the most havoc
Add the MySQL driver to make sure testNoConnInfoExport in AntHibernateToolsTest passes
Disable the tests that do not apply for HSQLDB 1.8.0.2
Comment out testParentComponentFailureExpected in Hbm2JavaTest until HBX-606 is implemented.
Remove duplicate line '<param name=testkey>avalue</param>' so Eclipse doesn't report a constraint error anymore
Update jboss-parent to version 6
Update main url, issue management url and scm information
Set version to 4.0.0.CR1
Merge pull request #32 from koentsje/4.0.x-devel

4.0.x devel
Merge branch 'master' of https://github.com/hibernate/hibernate-tools

Conflicts:
	pom.xml
adjusted some director stuff
Merge branch 'master' of github.com:curtisullerich/attendance
fixed form bugs
removed hard coding of wp_title() as per WP recommendations

Signed-off-by: hugosaner <hugo@sanerdesign.com>
fixed an echo in tag title

Signed-off-by: hugosaner <hugo@sanerdesign.com>
trying to fix bluetooth communication
fixes to file and image fields
Inicio do Grafo
oops screenleap and rm F7/8 in vim
Update README.md

added mysql module instructions
First attempt at what the gist of FlxText should be
Merge branch 'master' of github.com:danielcrenna/flixel-touch

Conflicts:
	Flixel.Touch/Flash/FlashFunction.cs
Added Closure Compiler license agreement.
added function to find vertex closest to a given point (useful for constructing
branched covers). To do: rewrite branched_cover.cc, especially the functions
new_index and compute_sheet; a plan for how to do this is summarized in the
preamble of branched_cover.cc

1. the function new_index should be replaced by an approximation
			new_index(i,s) = s*P.v.size() + i
which is then corrected at the end after all adjacency data is computed.

2. the function compute_sheet tests *every* vertex. instead the new packing
should be written as the trivial branched covering (i.e. (i,s) adjacent to
(j,s) iff i adjacent to j) and the adjusted *only* on indices i which are
on a branch cut, or next to one.
Recorder now notifies listeners about time changes.
some fixes from uni
Creating Stops information in stops.xml and reading in ViewModel
Finished first end to end demo - show Timetables for Tram nr 1 with stop id 1
Adding Info page with link to github
added the c++ which parses the json, there are the visual studio project
files but all the source files are there.
Added in the parser, has all the necessary source files except boost
Force use of TkAgg as backend for matplotlib. This change is necessery
for the plot window to show up on my Arch desktop which use matplotlib
v 1.1
Updating new relic production settings.
Rtree changes to work as .so
Added in the test project that got lost somewhere previously
Merge pull request #126 from dennishendriksen/testing

Do not expose system fields + small fixes
fix constructor: label can be null
Starting the draft for the first paper
Added New Activities for Add Place and Add Trip
tong commit
Merge remote-tracking branch 'choose_remote_name/master'
Add Tong
deploy takes --migrations
do not run migrations by default
bump: v1.3.19
pass all the arguments to ao
bump: v1.1.5
Revert "--chef may pass in a dir that doesnt exist locally"

This reverts commit 8663340e9a2b26498b0afe27e1044245ea0ce3ba.
get rid of CHEF_PATH env var
need to test for work
save the node_filter so we can use it later, after cap groups are called
challenges and localhost modifications are done before deploy starts, so
use deploy:start
logical start and finished marking a deploy session of any kind
mark each deploy session with start and finished tasks
bootstrap code at start of deploy, away from lock
renamed deploy:start to deploy:began
comments clarify the generated tasks
challenges, localdomain before deploy:began
bump: v1.3.1
aoh init to create initial Capfile, deploy.yml
bump: v1.3.2
shome is not the application shome!
bump: v1.3.3
use _AO_HOME for project home, tied to Bundler
define _AO_HOME in jason
bump: v1.3.4
without -u, _AO_USER defaulted to LOGNAME, which doesnt respect deploy.yml
bump: v1.3.5
get proxy mode to work, simplified
bump: v1.3.6
dont set search engine in ff
Primer Controlador
Prueba
Fixed test to create Camel context once
Merge pull request #1003 from diegosarmentero/master

 Fixed Issue #995 
Merge pull request #1004 from diegosarmentero/master

Fixing shortcut manager
Merge pull request #1005 from diegosarmentero/master

 Fixed Issue #987 
Merge pull request #1006 from diegosarmentero/master

 Fixed Issue #980 
Adding python3 migrations tips feature (with: Carlos Rodriguez)
fixing some other modules
update readme
multiprocessing freeze support
Merge github.com:ninja-ide/ninja-ide
Merge https://github.com/ninja-ide/ninja-ide
Rewrote windows file changed detection

Rewrote windows file changed detection as per what u1 people explained
to me about FSs in windows
Also improved a little tab widget handling of such events.
Merge pull request #695 from jmg/master

Support multiprocessing on windows packages
Merge pull request #715 from perrito666/master

Fixed freaking windows file changed detection
Merge github.com:ninja-ide/ninja-ide
shortcuts for human beings
Merge pull request #717 from diegosarmentero/master

shortcuts for human beings
fixing show navigation
Merge pull request #718 from diegosarmentero/master

fixing show navigation
dont change current line on open files
fixing shortcuts
Merge pull request #720 from diegosarmentero/master

fixing shortcuts
fixing cpu issue
improving stylesheet
Merge branch 'master' of https://github.com/diegosarmentero/ninja-ide
adding jump to line in locator
removing hideevent from theme designer
bb mdev
Implemented a DS command to switch dark fire weapons to skip shields or act as in vanilla.

Signed-off-by: Digdug <digdug34@gmail.com>
added read in prose link at the bottom
None type - int error
Added libraries for spring
Added 11th task
Added spring example
Added user creation to sample
Added property setting
Added Video Activity(Incomplete), Added AddLiveStream API Call, Modified ProgramGroup to fix linking and launch video.
Merge github.com:dmfrey/mythtv-for-android
fixed time formatting
Merge branch 'master' of git@github.com:dmfrey/mythtv-for-android.git
removed gzip compression. not implemented in mythtv .25 and there is a
bug in spring rest template that
doesn'https://jira.springsource.org/browse/SPR-7874t translate gzip
files correctly: https://jira.springsource.org/browse/SPR-7874
Added Video Activity(Incomplete), Added AddLiveStream API Call, Modified ProgramGroup to fix linking and launch video.
Merge branch 'master' of git@github.com:dmfrey/mythtv-for-android.git
fixed date format
added wrapper for LiveStreamInfo to accommodate for wrapper json object
updated layouts
removed support for pre-honeycomb devices
activity_frontends.xml
* Changed fragment_frontends height to wrap content.

fragment_frontends.xml
* Changed fragment to a Spinner

frontend_row.xml
* Changed to a linearlayout.

strings.xml
* Replaced frontends menu string with spinner prompt string.

FrontendsFragement.java
* Switched to displaying frontends in spinner.
Merge branch 'master' into mythmote_integration
added hilite to css
Remove onCreate hook entirely, as We don't need or want jQuery or twitter bootstrap.
Remove the function to generate CSS from LESS files, as we're not using less
Add onCreate hook which pulls in default (not AMDified) version of toji/game-shim
Added in qunit.css and move both it and the JS file into their own directory
Single dummy test that runs.  Next commit to this file will remove the dummy test and replace it with something useful.
Merge pull request #5 from dmose/browser-test

Set up browser-based testing framework with a single dummy test
Merge remote-tracking branch 'upstream/master' into game-shim to get browser test harness.
Test that GameShim has installed itself after requiring it.
Test that GameShim has installed itself after requiring it.
Clarified comment
Remove oneless.js, since the rest of the LESS stuff is gone
Wire up game-shim by default
Ship with game-shim easily available but turned off by default
Merge pull request #6 from dmose/game-shim

Include toji's game-shim by default, and get rid of some detritus from the original template that we don't need.  r=ack
Merge branch 'master' into volo-test

Conflicts:
	test/index.html
	volofile
insult achieves 90%
removed tabs from record.h
Dans le XML retourné par l'API, les heures sont au format "0-23" (HH) et
non "1-12 AM-PM" (hh).
Updated to 0.2.0, added contributors, preparing for release.
(*) Release 1.0

(+) screenshots
(^) many renamings
MySQL DDL to support class OAuth2_Storage_Pdo

Can be used to support PDO storage implementation.
Switch to google's CDN-hosted version of jquery
Correction orthographe, affichage d'un message de chargement lors du chargement de l'image d'aperçu du texte MyFonts pour la positionner sur la tranche.
Corrected error when setting boolean values to non-true/false
Corrected error when setting boolean values to non-true/false (actually, i think)
Made help command work.
Bumped up beta version.
Fixed portfolio indentation
updating web image
Fixed grade average bug
updated graphics and a small appointment schedular project started
Eventos

Adicionado activity para visualizar o flyer do evento
Criada a Activity de como chegar
AndroidManifest
Added Slovenian translation. Contributed by: Gregor Anželj
adding ability to expire an org
added PrintTableTest
added printTable and TestPrintTable
options: onSuccess() onFail()
Update BasicGame/src/model/VehicleProtagonista.java

Afegida llista de frenades; s'han millorat tots els sons
added last functions to a3
Test multi level bubbling
Discuss Backbone.View#dispose()
support for unlabeled trees and bracket sets; fixtures
Changed validation for preferred languages. Used array_key_exists
Commented p in textarea
Added a prolog predicate to process near desig-props
Minor fixes + rough implementation of far-from desig-prop costmap
Some parameters for near-to and far-from desig-props now depend on the object specified in the for desig-prop.
MYB-1723: Convert $.toJSON() to JSON.stringify() everywhere
started data model for generating charts in my personal page
fixed and organized code for downloading and compiling json and js files
updated, now working with the new get_data.js
commented some console.logs, console.warns and console.errs are to be kept
lots of comments, code organized
more comments, more organization
moved code for firstOrNull to extensions.js (added to the object Array), fixed mvc.js and index.js
more comments
added support for the fusion behaviour
*
several abstractions, support for events on compilation
getting ready for charts
several updates on the views
lots of superfluous line breaks arranjements :|
finally added jquery. created file for a context. created automatic loading and compilation of contexts. changed example posts for a new set of pages
moved posts example to a new folder. only had to change the urls of the scripts in posts.html
moved users example. some fixes
getting ready for defered-arrived views, some notes
Added league/team loading code
Send the application/json Content-Type

Turns out not doing that breaks everything.
Throw an error if you attempt to generate an authorize URL w/o scope.
t
Added userpool queries
Merge branch 'master' of https://github.com/fastaccord1/cs420siuc2012
Merge branches 'database', 'master' and 'network' of github.com:fastaccord1/cs420siuc2012 into network
Changed file name(this makes more sense)
Added some comments, also changed send method to accept different ports
Added class to store Address and Port of clients
Added methods to send the different update messages
Added code to interpret messages and changed sending methods to static
Exit if inquiry finished
Use JsonRefException some more

It cleans up the code quite nicely, and makes the code more straightforward.
(+) добавлены крестики для закрывания картинок и ошибок
Moved examples into this repo and updated docs
updated emily npm
submodule (changing the app keys to the ones from hackers.in.cts)

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
Merge branch 'master' of https://github.com/hackersInCTS/spinach-android
Committed by Travis-CI (build number - 2617010)
changes to java files for GCMPlugin

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
Merge branch 'master' of https://github.com/hackersInCTS/spinach-android
Committed by Travis-CI (build number - 2618373)
submodule (push notification is working (with a caveat))

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
Merge branch 'master' of https://github.com/hackersInCTS/spinach-android
Committed by Travis-CI (build number - 2618589)
submodule (changing title for nothing)

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
more android push notifications changes

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
Merge branch 'master' of https://github.com/hackersInCTS/spinach-android
Committed by Travis-CI (build number - 2633737)
Merge pull request #3 from FloydPink-Public/master

Merge the apks from FloydPink-Public [ci skip]
Committed by Travis-CI (build number - 2633755)
Merge pull request #4 from FloydPink-Public/master

Merge
Forwarded/Forwarding typo in 1.2.5

- Fix.
Make capitalization of Kind consistent

- There is 3 usages of the word kind in the document:
  - "Kind" as a data type is noew consistently written with the
	first letter in uppercase.
  - "kind of" always with the first letter in lower case.
  - "kind element" also in lower case.  The word element was added
	when needed to differentiate with other usages.
Potentially human readable

- Removed "potentially human readable".
Resolve circular definition for Resource/Resource Name.

- Redefined Resource to not reference Resource name.
Higher level description for Attach/Update.

- Rewrote the two definitions so to not use the Update/Attach message.
Merge pull request #5 from petithug/comment-28

Higher level description for Attach/Update.
Merge pull request #3 from petithug/comment-26

"Potentially human readable" clarified as per review comment.
Merge pull request #1 from petithug/comment-23

Forwarded/Forwarding typo in 1.2.5
Merge pull request #2 from petithug/comment-25

Make capitalization of Kind consistent
Merge pull request #4 from petithug/comment-27

Resolve circular definition for Resource/Resource Name.
Merge pull request #23 from deanwillis/level2

Level2
mem leak fixed

Signed-off-by: flyingdeath <flyingdeath@flyingdeath.com>
geometric3dShapes.js added.

Signed-off-by: flyingdeath <flyingdeath@flyingdeath.com>
value = 0 fixed.

Signed-off-by: flyingdeath <flyingdeath@flyingdeath.com>
final commit under gh-pages.

Signed-off-by: flyingdeath <flyingdeath@flyingdeath.com>
Item12251: improve performance on large foswikis by caching a webs iterator to be reused



git-svn-id: http://svn.foswiki.org/trunk/FlexWebListPlugin@16057 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Completed the move to implicit cookie usage so that selecting a language
at /#language only needs to be done on the first visit, closes #53.
Merge branch 'develop'
Initial work on migrating the geocode logic to a model class.
Set TimThumb to work with the new directory structure
important wording change
added custom filetypes.
Fixing port issue
More fixes to get Heroku running
more heroku bug fixes, adding host
fixing app name
Update 5/1/12 5:44
Updated README file
Merge branch 'develop' with fix for #1
initial refactor of file layouts
Refactored file layout
Refactored app file layout and it's still working
This is working for tests at least
	modified:   __init__.py
	modified:   core/models.py
	modified:   core/tests.py
	modified:   settings.py
Added post or page custom meta box functions
context problem solved for media chooser.

when you change file, it changes all file upload fields preview. fixed i
think.
fixing for remove.
Merge pull request #20 from onurozkan/master

pull request for wordpress 3.5 media panel.
replace host
Backed out template updates to archive
added social bits & blog w/ some include updates.
maintenant ca fait plaisir toute la css qui va bien
Add some UI for admin page
#5 implements new boundary
#5 removes NSLog statements
#5 updates random function
Merge pull request #6 from grandcentrix/5_boundary

5 boundary
initialize calisifier once
test: don't replace $stdout for debugging
test: use suitable name for intention of the test
test: remove needless require
Move codes shared with Analyzer and Extractor to the module
Updates to user guide for 0.3.1.
Added map syntax for specifying gradient stops.
Merge branch 'master' of github.com:groovyfx-project/groovyfx
[SEMANTICS] Simple types verification (basic requirements version).
Initial Commit - Adding all code
Merge branch 'master' of https://github.com/gsafcik/StockAvailability
search_gui_set_current_search(): revert previous fix, add check before calling.

The aim is to avoid "soft assertion" failures in the following routines:

	search_gui_start_massive_update()
	search_gui_end_massive_update()
Keep management dependencies in sync.
Merge pull request #157 from guilhermeamorim/master

Ajustes no diretório migrations do south.
Fixed tests for MySQL.
- Part extraction
- Minor fixes
- Intelligent staff splitting
- Misc
implement proper score tallying at game end
don't crash when an invalid game key is passed
block UI when socket connection is lost
re-establish sending of 'join' message when connecting
make notification go away when clicked.
Javascript libraries rearranged
expandable button backing view should be transparent to touches
Re-position contentOffset upon frame size change. This works for rotation both in the foreground and background.
Add key value observing support for view controller title views in the slider bar.
Add some style override points for subclasses.
Merge pull request #285 from henrikbrixandersen/master

Use correct spelling for G-code
Bugfix: use P instead of S for Mach3 for M106 too. #286
Use M109 for Makerbot bed control. #294
Bugfix: fatal error when generating skirt for layers having only two-point thin walls. #295
Add the coordinates of the first non-manifold edge to the warning message. #292
Bugfix: some holes were filled. #291
Only output M109 if there's none in user-supplied start G-code
Make sure all concentric fill loops are extruded ccw. #298
Don't slow down travel moves. #293
Raise Math::Clipper version number in Build.PL too. #303
New icon
Bugfix: no-extrusion was ignored
Multithreaded mesh processing. #154
Refactored parallelization code. #154
initial implementation of algorithm for #249

fix typo that put things in the wrong position

use int() builtin instead of POSIX::floor()

fix typo

use alternate method of creating local routines

remove aliases for new duplicate option

use coderefs for linear interpolate function, make binary insertion sort inline

add \n at end of die message regarding too many objects for print area

fix case where no duplication is done

fix whitespace according to slic3r coding style

assume 200x200 bed area if center is 0,0

Some cleanup to the autoarrange duplication logic
Merge branch 'triffid-duplicate'
adicionando meta-tags
adding insurgency and model rebellion data
added map image
client: Implement accelerating and shooting (click/shift-click).
Point device/asus/tf101 to my repo

Change-Id: Ib81adcaf3cd7d4092cfa7d7ade1efc57f866c86a
return correct values for empty segments
obfuscate hl7 messages
renamed & added documentation
button effects
fixed include path
updated changes file
[TASK] Cleanup of unused TS
[FEATURE] Added small manual
Fix: use specific dolibarr css
move output to build dir
jsmappy
JSON decode all responses, as array
add Cake caching
Fixed a poor poor spelling mistake
Add finish notification on worker-monitor
sortierungen für active admin indextables
	modified:   admin/applicants.rb
	modified:   admin/artists.rb
	modified:   admin/events.rb
	modified:   admin/invoices.rb
	modified:   admin/sponsors.rb
	modified:   admin/venues.rb
modified:   app/models/goldencobra_events/invoice.rb
	modified:   app/models/goldencobra_events/invoice.rb
	modified:   app/models/goldencobra_events/ticket.rb
Add Plack::Middleware::DBIC::QueryLog support
Removed readme.txt
Fixed loop.php to show older posts link and style.css to change link color.
more relaxed cookie parsing

(Broken) tools like Sloppy send cookie headers with no space
after the semicolon, like 'PHPSESSID=123;PHPSESSID=123'. Even
though the specs (RFC 6265, sect. 4.2.1) clearly state that a
space must follow the semicolon, Sloppy doesn't care.

This change makes the cookie parsing in AiP more relaxed and
allows more whitespace. Since it breaks the strict parsing,
it's only a suggestion.
Merge pull request #25 from xrstf/patch-3

more relaxed cookie parsing
table
Merge branch 'master' of github.com:infernalmaster/canactions
schedule css
schedule css
oops already..
web updated
Merge pull request #7 from iomz/GUI

Awesome!
Cleaned whitespace
Merge branch 'develop'
improve error reporting: better formatting + source that triggered the error.
rpmlint warning fixed
Add count 991
Fixed init task
Add phing base
fix team fight result file path
support custom widgets on referencefields
made user error work
even more 100% accurate grades
Hotfix: no error when unlocking unlocked puzzles.
Buttons now have text labels
Worked on tutorial got the mockup page done and am almost done with the controls page.
Display cloud test results in grid view.
added two rush crafts
Rename hml-basics
ssfsdd
seed features
basic class framework
Missing translations (en) for the "created_at" and "last_login" label
added the gray styles
Working retries
Turned off tab complete in SublimeText
msm: kgsl: Change name of vmalloc allocator

Change the vmalloc allocation name to something more appropriate since
we do not allocate memory using vmalloc for userspace driver. We
directly allocate physical pages and map that to user address space. The
name is changed to page_alloc instead of vmalloc. Add sysfs files to
track memory usage via both vmalloc and page_alloc.

Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>
(cherry picked from commit f99c263b56dbf6c7c57cf6edd7b3cbbdbc326bbc)

Conflicts:

	drivers/gpu/msm/kgsl_drm.c

Change-Id: Ia31c4ca61a699896689c3ad0c877659e21efd09c
Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
floor the end result of dragging an annotation
Testcase Seriele communicatie met Arduino toegevoegd

Signed-off-by: Michael Lucas <michael.lucas@kahosl.be>
Minor things, need to implement printf.... eventually...
add methods to app; add beginning of building your own...
guess it's minitest_helper not spec_helper
Yes, the much feared, stupid mass commit.
Adding #scanLeft to DynamicArrayList and DynamicList
Renaming Transform to more widely-recognized Map
Stop using id's as globals (facepalm)
Derivative intuition review feedback
Remove unneeded KhanUtils
s/const EXPORTED_SYMBOLES/this.EXPORTED_SYMBOLES/
Merge pull request #125 from joewalker/exported-symbols-update

s/const EXPORTED_SYMBOLS/this.EXPORTED_SYMBOLS/
simplie
added files
klout api
Revamped property callback system and made changes to README.md
Issue01 Solved

Fixed Active Button and Content
ci | Subhas | After hundreds of local commits, here is a single commit that runs complete android suite in travis
Merge pull request #10 from rdsubhas/master

ci | Subhas | Complete test suite (including Integration tests) in Travis
Modified the MapHandlerRegistration class.  There was a typo in native
Javascript.  This will allow for classes to unregister from the map
listener.
Merge branch 'master' of https://github.com/davidnraines/GWT-Maps-V3-Api
first pass lint-fixes
handle defines like classes'
Unquote double-quoted strings.
Make file modes octal.
Better regex for " -> '
Use two-space tabs.  Handle empty, quoted strings.
Modified README and install instructions
Adds a method for getting video duration.
Added video duration and conversion status to video entity menu.
Added classes for video conversion.
Added delete action.
Added class for creating thumbnails from video. Added better error handling.
Added missing translation.
Make video resolution configurable from plugin settings.
Added missing translation.
Added missing translation.
Fixed functions which set and get the converted video formats.
Fixed the query that gets the unconverted videos.
Flag new videos as unconverted on upload so the conversion script can find them.
Delete action now deletes all formats of the video and also the thumbnails.
Added missing translations for error messages.
Display video player only if video conversion has been finished.
Added a toggle to extra menu for switching between list and gallery views.
Tidied up the gallery view.
Creates a video src tag only for the formats the video has been converted to.
Added a method for getting file base path (no file extension).
Uses readfile() to output the video file to avoid memory issues.
BUG 9591 The date last login isn't correct SOLVED

- I add a convert for float to field month
Merge pull request #438 from julceslauhub/master

Delete extra colon in the open.js
BUG 9572 Print Dynaform is not working when a case is open... SOLVED

- Undefined variable used.
- Was validated using using the variable.
Merge pull request #437 from brayanpereyra/BUG-9591

BUG 9591 The date last login isn't correct SOLVED
Merge pull request #439 from marcoAntonioNina/BUG-9572

BUG 9572 Print Dynaform is not working when a case is open... SOLVED
Fix the message when try to open a case that is of other user
finaly without backgrounds
Fix integer check

If we use "type": "integer", and property is boolean we got an error result (true).
Must be false, because boolean values (true/false) is not a integer.

UPD: Take into account the integer in string.
Merge pull request #19 from bayandin/patch-2

Fix integer check
footer links, report button, updated guides page
Merge branch 'master' of https://github.com/jzone3/Project-Alexandria
added some old classes
inverted graphs
adding exercise to workout
please check why we need this code
Merge pull request #15 from karthiksai04/master

unread
Disabled sphinx temporarily
Removing security controls to make the app snappy again. Will revisit.
Fixing lag. The prompt function seems to have been the culprit(?!)
Update HarryPotterSpells/src/com/lavacraftserver/HarryPotterSpells/Utils/MiscListeners.java

Added the AsyncPlayerChatEvent for bukkit 1.3
Merge pull request #31 from RingOfStorms/patch-1

Update HarryPotterSpells/src/com/lavacraftserver/HarryPotteUrSpells/Utils...
Update iQuestionMobile/assets/www/js/extra.js

Update readAnwer() function
Backport r357455 and r35834

These deal with using ODBC CDRs and asterisk failing to properly detect
the SQL types

Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
DB周りの変更
Merge pull request #1 from kiichi54321/kiichi

DB周りの変更
fixed timers and alarm
Fix overlay bugs.
Updated the documentation for the PlayerDashboard
fix build b288a4
refactoring test2
Merged tiers.js and viablemoves into one file - teambuilder-data.js
Fixed the teambuilder-data.js generator and regenerated teambuilder-data.js
use to commit for the second time
Added pages note.
Ignoring gh-pages directories.
Updated endpoint to point to pages url.
apache conf to serve echai
poor me
Allow users to start a theme directly or vote.
Added option to have doubles and triples mode in tournaments.

Also added a mode checker.
Merge git://github.com/lamperi/po-server-goodies
Merge https://github.com/Shadowfist/po-server-goodies into shadowfist-branch
Fix JS style.
patch for function isInTour()
announce downtime
Allow bot colour to be changed
lightsensor calibrate in lightsensorpackage gezet, NONE als
lightsensorupdate toegevoegd, orientonwhiteline() aangepast zodat deze
gebruik maakt van lichtsensorpackage lightsensor ipv eigen lightsensor
Merge branch 'master' of https://github.com/lannoysamuel/penoteamgeel.git
Added setup.py and releases, with release 0.9. Also added -v and -t flag
lab thing
Merge branch 'master' of four-teachers
merged exisiting stuff
Merge pull request #1 from suharshs/master

lab stuff
Updated one more chapter based on proofreading
Two more chapters updated
Controller
Dark Layer
Util Functions
Store Face
Stores
Store
CastalPage Data
New Buy Dialog
Static
Fall Goods
Castal Page
MenuLayer
MenuLayer
Director 中增加了
replaceScene(view) 用view为根的新场景 替换当前的场景
pushScene(view) 将当前场景压入堆栈中， 并用view替换当前场景
popScene() 将当前场景删除， 将堆栈顶部的场景弹出

增加了views/Button.as 用于实现普通button的功能
传入 bg节点 和 回调函数 以及参数即可

合并了代码：
MapScene --- MapLayer
MenuLayer --- ChildMenuLayer

场景控制流程：
首先replaceScene(new CastleScene()) 压入城堡页面的场景
点击菜单选择 map pushScene(new MapScene()) 压入 选择地图场景
点击奇迹村落  popScene() 弹出 城堡场景
User 用户数据
BuildLand 经营页面的三块陆地
Button 简单的Button模块
ChildMenuLayer 子菜单页面
FallGoods 掉落物品的node层
FallObj 掉落的物品
Goods 商店页面显示的物品选项
MapLayer 选择战斗页面
MapScene 选择战斗场景和经营场景
MenuLayer 菜单页面
template 一个简单的模板
Added pins
Updated changelog
created for work testing
design update (left box)
some change on crawler
most efficient server stats
example css/js assets
Connection template and tests
Test configuration
EventInterface
Addin dynamic finders
Removes .orig file
add mov support
filter out non-participating members
firstメソッドとfindメソッドでレコードを読み込みできるとこまで。
RAR: Better granularity w/ KPC=0 (vs auto-homing). Auto-define NVIDIA from
cl_nv_pragma_unroll for architecture tweaks. Bump plaintext length for
better coalescion. Init lengths to 6 so the self-tests don't end up wildly
diverging threads (when it just sets a few keys out of thousands).
pass_gen.pl: Support for sha256crypt and sha512crypt
Merge branch 'magnum-jumbo' into bleeding-jumbo
options.c format list: Workaround for silly Windows bug at column 80
Fix a typo in bash completion
success page
Merge branch 'master' of https://github.com/maisaengineering/kidslink
child dash board
Merge branch 'master' of https://github.com/maisaengineering/kidslink
mpcPlaylist: add mpd adapter

some regexes had to be rewritten because auf newgrounds page rebuild.
The files will NOT be downloaded but just added to the mpd playlist
Sync from main repo
Merge pull request #2 from KDGDev/master

OK
clean.r file created
家中做

家中做
haciendo mas especifico el selector para las imagenes y checks en las tablas
corregido bug en my_acl al verificar la existencia de un template

no estaba colocando la extencion en la verificación y por eso no conseguia
el template en la app
javascript completed course
Refs #11 and #13. Getting the feature information from the db to the
treeview widget.

Had to make the database a regular file in the package.
Include `$.mobile.forceReverse` to be able to set the 'reverse' direction, even when the link binding was disabled. Useful when you're using backbone & jquery mobile, so:

```
$.mobile.forceReverse = true;

($('a[data-rel="back"]')).live('click', function() {
  $.mobile.forceReverse = true;
  window.history.back();
});
```
Spieleverteilung automatisch
Spiel ID Problem
mehrer spiele mit gleicher id?
trieda label

od je oddeľovač čísel
CodeGenGlobalInitializer, uprava size v Primitivetype
Changed dirty build implementation from '1/0' to 'true/false'; Updated version to 1.1.0.0; Updated readme
Add nodejs installation support
Bump version number to 0.6.0
more work on command line client: REPORT and GET work fine
Add nelect and final mag parsing to OUTCAR.
Unittest fixes.
Merge branch 'master' into rest
Reader#save_articles() returns callback with error when user is not logged in
Introduced IAP modular structure
initial, unstyled UI
Odstranenie nepotrebnych buttonov, pridanie akcii, vykreslenie na label, zoomovanie v namedwindow
LPS-30457 Deprecate TestPropsValues.getServiceContext() to avoid testing with Guest group
LPS-30457 DDMStructureServiceTest and DDMTemplateServiceTest must use their own group
2128 Sort dates ascending
initial commit
Merge branch 'master' of github.com:meiriko/phonegap-tutorial
one more push ;-)
Adding hover into previous and next button
Fix Pinterest button
Merge pull request #13 from pazguille/master

Fix Pinterest button
Fleshed out a very basic structure.
Branch/merge fixes - initial branch commit and FetchNodesQuery changes

-Changed the initial branch commit to not have initial path and diff.
Without this, the branch thinks that the root node deleted its children.
-Changed FetchNodesQuery to not only return nodes in the branch but
also nodes in trunk before the branch was created.
Adding unit tests for lexer, should have had these from day 1\!
Add composer.json file
Add requires/suggests
Fix type
first steps towards making the template resource scanning more flexible (see liip/liipthemebundle#7)
Merge pull request #42 from Seldaek/composer

Add composer.json file
Fixed dependencies.

Assetic is known as `kriswallsmith/assetic` in packagist, not `assetic/assetic`.
merged branch marijn/patch-1 (PR #49)

Commits
-------

b4db651 Fixed dependencies.

Discussion
----------

Fixed vendor dependencies.

Assetic is known as `kriswallsmith/assetic` in packagist, not `assetic/assetic`.
Fix composer file, assetic has no tag with composer info
merged branch Seldaek/composer (PR #51)

Commits
-------

8c3d65c Fix composer file, assetic has no tag with composer info

Discussion
----------

Fix composer file, assetic has no tag with composer info
Updated sprockets filter config to put the sprockets lib directory instead of the sprocketize binary
Merge remote-tracking branch 'lsmith77/template_resource_scanning' into 2.0
Merge remote-tracking branch 'Langwhich/master' into 2.0
added missing sprockets config
added version
fixed assetic version
Allow more than two dots in template file names
Merge pull request #67 from snc/patch-2

Allow more than two dots in template file names
Assetic fix for original Symfony PR #3273 (https://github.com/symfony/symfony/pull/3273).
Fixed the composer constraints
Revert "added coffeescripts bare option"

This reverts commit 8f3be1f4f268f43c0a497c04d8ccdf83986db277.

Fixes #94.
Fix initial errors

Fix for missing end to foreach loop.
Fix missing attribute leading expression block.
Refactor code to be easier to test

Rename Renderers to Translators.
Use ITranslator interface, to make testing possible.
Write unit tests for individual translators.
helper method for determine whether to show add button or not
-Añadida funcionalidad para formatear textos
-Retirada página de editcard, unificado en editSpeech
-Nueva pantalla choose
-Eliminada pantalla editCard
add some key listener stuff
New package: dev-haskell/handsomesoup.
redesigning fiche pays
Removed obsolete migration
Merge branch 'zones'
Rama propia para ohiggins
Merge branch 'master' of https://github.com/Emergya/persistence-geo
[#71421] Integración con geoserver.

Creación y eliminación de workspaces, datastores, featureTypes y
layers.
[#71421] Integración geoserver

Capa de servicio.
[#71421] Integración con geoserver

Modificación de los pom.xml (cambio de versión) para su merge en
upstream.
Merge branch 'master' of https://github.com/Emergya/persistence-geo
Geoserver test instance added.
Merge branch '1.1-gs-integration' into ohiggins-master

Conflicts:
	persistence-geo-core/pom.xml
	pom.xml
Updated 1.1 version
[#69767] Shp2psql

Preparing new version 1.2-ohiggins-SNAPSHOT.
[#69767] Import SHP into Postgreslq 

Verifies and import shp files to Postgis database.
[#69767] Import SHP into Postgreslq

Try to guess EPSG code using .prj file of SHP it this file exists.
[#69767] Import SHP

Change column names.
Merge branch 'master' of https://github.com/Emergya/persistence-geo
Merge branch 'master' into ohiggins-master

Conflicts:
	persistence-geo-core/pom.xml
	persistence-geo-rest/pom.xml
	pom.xml
Add git revision to JAR and WAR

Add git revision number to META-INF/MANIFEST.MF included into JAR and
WAR files.
Merge pull request #1 from juanluisrp/version-control

Add git revision to JAR and WAR
Fixes duplicated serialVersionUID field.

Change the serialVersionUID field to be universally unique.
Merge pull request #2 from juanluisrp/serial-version-uid

Fixes duplicated serialVersionUID field.
mysql gem
added splash page and user authentication system
Added map markers to MANIFEST.in
Merge pull request #95 from mollyproject/routes-provider

Added map markers to MANIFEST.in
DOCS-802 mongodb driver requirements
minor: refactor step_down_command
added the rpms target
cleaned up code. added session logic. started scheduling
Prevents exceptions when migrating an existing app

Exceptions were being thrown when `rake db:migrate` was run while
installing the extension into a project with an existing database.

This commit ensures that ActiveRecord won't attempt to access the
tenant_id field or the spree_tenants table until they have been
created by migrations.
Ensures that model table exists before inspecting it's columns
Merge branch 'topic/saftey-checks' into 1-2-stable
fixed CFC compilation error from invalid for-in
Geddy Todo App
remove test background color
Calculating gapConditions with allForbidenQuanta instead of just mirrorQuanta
Extended functionality to populate db tables because is awesome
Accessing a web service via an AsyncTask
header was added;
added header;
added body;
Comments added to simulateWithMemory(). One or two lines modified, but no functional changes.
Merge branch 'master' of https://github.com/nathad02/CITS2320_Project.git

Conflicts:
	Project.c
Let users disable Dyslexia Mode with choice No
Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would not be notified once a non-local friend was found.
bpvtybk afqk 12
require sfsobject.
Release 0.2.1
add jinjing src, fix typo
initial commit, Intro, Section 1, and Section 2
Renamed addpeople to managegroupmembers
Finished scaffolding the first script in excercise 3
adds: portfolio
fix: title
add-apt-repository does not accept a '-y' flag
lib: allow overriding maxSockets
Merge pull request #323 from indutny/fix-maciej-issue

lib: allow overriding maxSockets
todo: figure out why the discrepancy between the RHS and the correct solution. Need to switch to binary format?
se mejora el ABM cliente
pylint... you lied to me.
BOA: Use our mirror for MartPlug download, just in case (Robert)
BOA: NodeStream 2.0-a13 (Robert)
BOA: Octopus Video 1.0-a6 (Robert)
BOA: OpenChurch 1.10-a1 (Robert)
BOA: OpenPublish 3.0-a8 (Robert)
BOA: Ubercart 2.9.1 (Robert)
Add trailing slash to projects api.
Re-add django-filter to requirements.txt.
Merge branch 'master' into fullpage-ember-and-re-css
[OE-2162] multiple diagnosis changes.
[OE-2162] bugfix
[OE-2162] store event date with secondary diagnoses
[OE-2162] bugfix
[OE-2162] bugfix, POST'd secondary diagnoses weren't showing up if there were form errors.
[OE-2162] fixed bug when saving the diagnoses element.
[OE-2162] show principal diagnosis at the top of the list in view mode.
[OE-2162] bugfix
[OE-2162] bugfix
[OE-2162] use adjective when displaying eye.
[OE-2162] restrict diagnoses selection in examination to ophthalmic.
[OE-2162] tidy up and code refactoring.
[OE-2162] changes to support removing diagnoses from the commonly used list when they've been selected.
[OE-2162] bugfix
[OE-2162] refactoring - adding and removing diagnoses should happen in the models.
[OE-2162] bugfixes
Merge branch 'release/1.1-moorfields' into jira/2162

Conflicts:
	assets/css/module.css
[OE-2162] hooked up cataract eyedraw widgets to the diagnoses element.
[OE-2162] bugfix
Redirect LOCI website links to openmicroscopy.org
Redirect a couple of additional URLs
Fix STABLE_BUILD URL by appending STABLE_VERSION
Merge pull request #223 from sbesson/loci_links_redirection

Redirect LOCI website links to openmicroscopy.org
Merge pull request #41 from sbesson/matlab_util

Add Matlab utility functions
Redirect LOCI website links to openmicroscopy.org
Redirect a couple of additional URLs
Fix STABLE_BUILD URL by appending STABLE_VERSION
Redirect Bio-Formats downloads link in command-line tools
Merge pull request #229 from sbesson/loci_links_redirection_develop

Loci links redirection develop
increase the left padding of the number of cores in vmmap vm cell
Add truncation of too long hostnames, adjust the min width of the vm cell to accomodate the truncated length. Closes #67
make grid coverage from 2d float array instead of ushort buffered image
async library for control flow
Modified .classpath to include the correct libraries (moved from lib to libs)
RID:- m:Moved static methods used regionally to the utility-class
RID:1.1 & 1.2 m:Updated and rearranged search Libris functionality to
DataBookFactory, removed ModelLibris
RID: 1.1 m:Added comments to the database
Merge branch 'WorkingBranch' of github.com:oscarbr/Brainiacs-startup into WorkingBranch
CLOSE - task 12: Test ID: 1.1.5-N resulted in a bug - publishing year 
http://github.com/oscarbr/Brainiacs-startup/issues/issue/12
Issue #12 quickfix of previous commit
Merge branch 'WorkingBranch' of git@github.com:oscarbr/Brainiacs-startup.git into WorkingBranch
RID:- m:Added library required to the manifest
Merge branch 'master' of git@github.com:oscarbr/Brainiacs-startup.git into JenkinsFix
Minor changes to sublime plugin
Version bump to 0.4.3
first commit
first commit
second commit
Initial project commit
Added doctrine setup files
added doctrine mapping and entities
made path configurable
remove backup files
added user entity and mapping
Added login/logout functionality
Incident ORM files added
Merge branch 'master' of git.assembla.com:IncidentReporter
removed obsolete files
removed helpers obsolete files
removed other obsolete files
removed other obsolete files
add gitignore
Added ORM files
ORM changes
Added ORM files
Patched to fix rake use in padrino templates. 
Merge pull request #841 from jasonm23/patch-1

Patched to fix rake use in padrino templates.
trying character codes
added get following removed previous bugs
As expected, removed crypto hash junk
Now should be storing and reloading class string of the remote tileentity.
Fix issue #1. Add word list encoder and single solver utilities
Username en password worden nu url encoded wanneer ze gebruikt worden om
in te loggen
Oude calendar lib verwijderd, nieuwe lib (voor mac dock icons)
toegevoegd
Creada feature cucumber para Producto
Send detailed PlayerState
GooManager:

Cleanup

Signed-off-by: Paul Beeler <sparksco@gmail.com>
Fixed spelling mistake for blog tagline.
Taking out employee row padding smarts. It's too buggy to be worth it.
Merge branch 'master' into staging
Reportes 'Casos por subgrupo' y 'Casos por EPS'
Fehler entfernen wenn Eingaben korrekt
removed permeance-parent as parent - too complex to manage the cycles
Update lib/assets/stylesheets/jquery.ui.theme.css

remove images directory on jquery ui theme
Commenting the code that is not working

1. Add/Remove elements from nested tables.
2. Alarm Data.
- reduced logging for junit tests
Updated slf4j-log4j12 dependencies to be runtime since they are
runtime-only implementations.
Removed redundant compile scopes from dependencies.
Added log4j.ignoreTCL system property so that log4j classloads properly
inside the OSGi bundles. Switched karaf over to use felix since the
logging is easier to follow.
Added enemy exploding sound.
background music fixed

fix using winapi. need to find a solution that isn't platform specific

eg openal, sfml, portaudio, etc
[Piyush] Adding mongo service to travis configuration, so that specs pass on the ci
libquvi is now in libquvi package
release 2
updated to report
test plone.app.textfield in subform rendered by MultiWidget
Unbanning DeepSeaTooth
Merge branch 'master' of github.com:po-devs/po-server-goodies
Removed Peter Antmans logging.properties.
import issue fix

Signed-off-by: Ondřej Koch <okoch@dns.cz>
TRUNK-3750 - TestOrder.specimenSource should be FKd to concept, not just a plain integer
TRUNK-3748 - TestOrder.laterality should be an enum with LEFT, RIGHT, and BILATERAL (not an integer)
TRUNK-3747 - Add urgency to orders table and give default value for orders.urgency in liquibase, so it can be applied to existing databases
Added @since to ConceptReferenceTerm - followup to TRUNK-3745
https://tickets.openmrs.org/browse/TRUNK-3745
TRUNK-3719: "Manage Forms" visible to all users under Administration
TRUNK-3720: check View Current Users privilege to display link