labofsahil/github-event-dataset-2012 huggingface dataset:
added twilio
major work on sms responses
sms messaging
done with sms for the night
sms subscription pages and sms profile page changes
Merge branch 'sms' of github.com:damianball/ZombieSource into front-end

Conflicts:
	www/application/config/organization.php
	www/application/libraries/Tag.php
	www/application/views/layouts/main.php
Merge branch 'tweetfeed' of github.com:damianball/ZombieSource into front-end
tweetfeed
Subscription settings page now saves settings.
tweetfeed is almost finished, stylesheet put into bootstrap, made sms stuff look pretty
Merge branch 'minor' of github.com:damianball/ZombieSource into front-end
fixing bugs
fixed minor button margin
edited views
Better SMS responses, sms bug fixes
Merge branch 'front-end' of https://github.com/damianball/ZombieSource into sms
Merge branch 'sms' of github.com:damianball/ZombieSource into front-end

Conflicts:
	www/application/views/profile/sms_settings.php
added orange to sms
tweaking responses
cleaning up for code review
Merge pull request #13 from damphyr/master

Differentiate between development and runtime dependencies in gemspec
bump rautomation dependency
Merge branch 'master' of github.com:jarmo/win32screenshot

Conflicts:
	win32screenshot.gemspec
update version
improve warning message
added w1e6 to the repo
seed the server with a statis sample
different units for graph and summary
Adding license file and a script to automate the process
fixed conflict
added Payment_Detail model
Minor reorganisation of js folder structure.
valgrind: fix some uninitialized memory/premature free stuff.
bauhaus: make gtk labels and new widgets match.

- obsoletes bauhaus/scale in darktablerc
  (size is now adjusted to font size in darktable.gtkrc)
- font colors adjusted
- indentation still wrong
re-enabling HTMLPurifier, now using standalone version
empty values are interpreted as missing (instead of 0)
Add command to clear cache
Updating class diagram.
fix barWidth on zoom
google plus profile link
affichage fond + soucoupe
Fixed file uploads to not remove periods, hypens or underscores
Revert "Adding DECIMAL_DIGITS to SQLServer size field for scale info: http://msdn.microsoft.com/en-us/library/aa258832(v=sql.80).aspx"

This reverts commit 7d970ab2f075db388df497e896510a971000b8ad.
*Fixed stuff
BLAH
MORE BLAH
update post receieve hook example
half-finished big naming update
f - one time error
nunnery update
Left off at 3-13. Created a index.html
added search bar to station profile pages
adding ged management
commit of ged module
I implement FizzBuzz class
Waaaay over due commit, OS reinstall etc, to much to comment
Shield updates
Updated README according to last changes
Black font color on active menu hover (important).
split out gtk rendering into a separate package

The motivation is to reduce the dependencies of diagrams-cairo.  There
were reports of people able to install the 'cairo' package but not
'gtk'.

  * Diagrams.Backend.Cairo.Gtk is now Diagrams.Backend.Gtk in the
    diagrams-gtk package.
  * Remove dependency on gtk package.
  * Remove the GTK output type.
  * Add a 'RenderOnly' output type, for when you don't care about the
    IO action but only want the cairo Render action
  * Add a Bool 'cairoBypassAdjust' option to bypass calling
    adjustDia2D, which is used by the GTK backend but is a sensible
    option to make available for general use.
remove more gtk deps
Merge pull request #20 from diagrams/gtk-split

split out gtk rendering into a separate package
update news typo
tweak one position
tweak fp slideshow h2 color
moved twitter time parsers into parser_util
Clean up/simplify flatten.
Agrego la primera versión del PSD general
+ ‘Nitin.txt’
- ‘New Text Document.txt’
Correct memcache path, add DjangoPerformanceTest, and ensure sql handles params correctly
Improve example suite
Revert "Create gh-pages branch via GitHub"

This reverts commit b38076ee78402b50992cae753bf17edd9fb7dd47.
started migrating from ItemDefinitions to item classes
Demo is working with JPA
Begin to cache Cargo container runtimes
Remove useless video args
Add makefile for opendingux and fix compiling with it
Change O3 to O2 for mingw
Instead of passing individual functions to the template, pass a
TemplateUtils object, which already knows about the request object.
More exercises for people who haven't had enough.

(I doubt there are any.)
Use a PersistentList for the User's followers.
Add solutions for the ex6 exercise.
The dependencies.
Refactor Client to Inherit from Savon::Client
Update FakeWeb URI to ChannelAdvisor V6 API
Refactor Configuration
Refactor Order Class
Update Custom RSpec Matcher for Refactored Order Class
Added AdminService .ping .request_access(local_id) and .get_authorization_list(local_id)
Includes AdminService RSpec spec
Fixed few failing specs and moved stub_* wsdl and response into spec helper module
Added SimpleCov for Ruby 1.9 when running specs
Merge pull request #1 from sheetmusicplus/admin-service

Add Initial Admin Service Implementation
Add VCR Gem to Stub Web Services
Remove Obsolete Connection Spec File
Refactor Configuration and Specs
Begin Moving SOAP Interfaces into Service Classes

Handling of direct SOAP interaction, i.e. interaction with the
ChannelAdvisor API at it lowest level, is abstracted into a module with
classes that directly correspond to the service and method names
provided by the ChannelAdvisor API. An additional layer of abstraction
is provided for ease of use but the lower level will still be publish
its methods for interacting with ChannelAdvisor in a more direct way.
Moved ChannelAdvisor::Admin CA api calls to ChannelAdvisor::Services::AdminService.
Attempt to update specs and VCR cassettes, a few FIXMEs with the VCR cassettes.
No sure if the cassettes are setup correctly all requests appear to be hitting the CA API.
Merge pull request #3 from sheetmusicplus/services-admin

Admin Service and Specs (with VCR)
Refactor Specs to Validate SOAP Request Generation

Change the focus of specs in the Service classes to validating that the
XML is well formed and with the appropriate elements rather than
validating at the integration level. Before we were specifying in a way
that was partially validating how ChannelAdvisor's API behaved but now
the specs ensure that our code generates XML that is compatible with the
current version (v6) of the ChannelAdvisor API. Integration tests will
follow separately to validate that end-to-end web services calls are
successful.
Sample to convert on the fly mp3 to ogg with FFMPEG
Fixing merge
Merge for CSProj file
Most of URI up and running
Ehh.. Uncommitted stuff that dates way back on my desktop computer.. Have like no idea what this is.. :)
Merge
Comment on tests re: issue #2
Removing DomUdall from title
Various major structure and config changes
added sample client for testing
장소선택 시 찜하기 버튼 무조건 보이고, '장소선택'버튼은 새모임 만들기에서 접근할때만 보임.
DoYouHaoBaby-2.1 #修复框架对应用URL生成的一个致命缺陷
提交
修复个人空间好友头像在宽屏电脑下面没有占满的bug
提交代码
订单页面新增的支付方式
Merge branch 'master' of github.com:doyouhaobaby/needforbug
fix KEY_LPG{BCK,FWD} listening for crereade
add fix KEY_LPG{BCK,FWD} listening for filesearcher
add fix KEY_LPG{BCK,FWD} listening for helppage
add fix KEY_LPG{BCK,FWD} listening for unireader
change keycode for KEY_LPG{FWD,BCK} in emu mode

KEY_LPGFWD now binds to F7 and KEY_LPGBCK to F6.

you will get a interesting result when testing
alt combo with previous keycode.
add: hint message for inputbox

use hint message to indicate current page
in goto page feature.
Merge pull request #129 from houqp/master

fix for #128 and inputbox improvement
Cleaning up the Loop class

Cleaned up the Loop class and added some more documentation to it.
Updated tasks in README
Checking in TS projects, adding new music.
Simplified slugs to make them lame but working
Minor fix for On stage tab margins in IE.
Merge pull request #3 from dsecrest/bug/ie_fixes

Minor fix for On stage tab margins in IE.
Fixed some rename issues!
Merge branch 'mixpanel_defaults'
update user management
update data sql
Neue Texturen

Neue Hintergrund Bilder + Musik
Shoadow dom
added vision board
Missed another call (2.0 seconds -> 1.5 seconds for 1,000,000 chars).
404 if iso is invalid + test
Merge branch 'invalid_iso_404'
attended_short_list added
Better MT Process version for future compartment class
removing my email for spammers
config: Disabled Sakuractive and Lazy governor
Revert "clockevents: Set noop handler in clockevents_exchange_device()"

commit 3b87487ac5008072f138953b07505a7e3493327f upstream.

This reverts commit de28f25e8244c7353abed8de0c7792f5f883588c.

It results in resume problems for various people. See for example

  http://thread.gmane.org/gmane.linux.kernel/1233033
  http://thread.gmane.org/gmane.linux.kernel/1233389
  http://thread.gmane.org/gmane.linux.kernel/1233159
  http://thread.gmane.org/gmane.linux.kernel/1227868/focus=1230877

and the fedora and ubuntu bug reports

  https://bugzilla.redhat.com/show_bug.cgi?id=767248
  https://bugs.launchpad.net/ubuntu/+source/linux/+bug/904569

which got bisected down to the stable version of this commit.

Reported-by: Jonathan Nieder <jrnieder@gmail.com>
Reported-by: Phil Miller <mille121@illinois.edu>
Reported-by: Philip Langdale <philipl@overt.org>
Reported-by: Tim Gardner <tim.gardner@canonical.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Linux 3.0.15
Обноление по компоненту trener
[deps] bump request to 2.9.153
[package] homepage, bugs
[license] added, linked in package
add stopwatch file
Prepared repo for subtree merge with BURP
* added blockquote button to wikieditor extension
Created a gem.
Handle OPTIONS request in new-proxy
Handled connection failure in new-proxy
Removed a debug console.log statement that was annoying me.
added cors proxy
Agregue archivos al gitignore
rm static/text.js
rm old tpl and jquery.widget class
rm old jquery-ui widget
renamed main.js
initial collections
Main with initialize and
time model
auto configured urlRoots from main.js auto discovery
cleaned old process
rm require_config
rm pages.js
Merge branch 'feature/noauto' into development
use full-path to provide URL
`py-beginning-of-def-or-class' argument

With C-u go to beginning of class.
resp. to `py-end-of-def-or-class'

branch merged Urs Fleisch 2012-08-14 Support completion of module global variables.
spurious bar left from merge removed
Validating the file extensions.
Tweak the menu nav css
added new php project information for eclipse PDT
Added student profile
fixed up buffer file name variable in drupal functions
updates to drupal functions
Added readme containing design notes for the database file.
use urllib instead of own implementation
Added slabaws to host-ls.
More readable font
remove competion & refactoring
A few tweaks for QSystemTray in Windows
Added a timing test. Results are about what I expected:

~4,000,000 cache HITS per second  (just to get the pointer to the already-cached data)

~50,000 cache MISSES per second (when data has to be fetched from disk, 128 byte chunks).

This hardly matters, though, because we will only ever do a couple  queries at a time.   Any bulk operations (blockchain scans) will be done separately anyway using optimized, buffering, etc.

Probably, we would want to look at all the transactions in a block, so we derefence the FileDataRef for the block data (cache miss), then deref each tx in that block (cache hits).
Merge branch 'blkchainagain' of github.com:etotheipi/BitcoinArmory into blkchainagain

Conflicts:
	cppForSwig/BlockUtilsTest.cpp
INTEG-95 | ForumSpaceActivityPublisher must consider topic and post owner as activity author.

Fix description: Get exactyly the owner of created topic/post insteads of git the current log user for all injected data.
Fix get() on Felamimail_Backend_Cache_Imap_Message. Was'nt encoding folder name.
Merge branch 'IMAPAdapter' of github.com:explivre/ExpressoLivre3 into IMAPAdapter
task#3998 - Allow comma and semicolon as email delimeter
task#3998 - Allow comma and semicolon as email delimeters
Task #66 - Change icon of button "Mark as Important"
Removing the commit error marks
Merge branch 'review' of github.com:explivre/ExpressoLivre3 into review
Task #66 - PT_BR translation of "Mark as Important" button.
Merge branch 'review' of github.com:explivre/ExpressoLivre3 into review
Correction of header code documentation
Merge branch 'master' of github.com:explivre/ExpressoLivre3
Correction of header code documentation
Allow send message as text/plain
Ensure text/plain format when sending plain
addresssbook get image bd pgsql. 
Merge branch 'review' of github.com:explivre/ExpressoLivre3 into review
Ensure text/plain content-type when sending plain
Merge branch 'review' of github.com:explivre/ExpressoLivre3 into review

Conflicts:
	tine20/Felamimail/js/MessageEditDialog.js
Added employee_number attribute to addressbook.
Changed employee_number attribute type from integer to string.
#Task 54 - Permitir uso de contatos dinâmicos na edição de mensagens
addresssbook get image bd pgsql.
Merge branch 'addressbook' of https://github.com/explivre/ExpressoLivre3 into addressbook
Added update to Addressbook setup to insert employee_number attribute.
Add comments so it is clear which functions have a context update side-effect
extracted tomcat embed code into EmbeddedTomcat class
created RequiresRunningEmbeddedTomcat junit rule
Uploaded UMLClass class diagram.  (will upload other diagram too)
fixed haskell's multi-line commenting being mixed up with single-line commenting.  Fancy/Sexy commenting should work with .hs files now.
Fixed export variable
Fixing case of some words on the doc
Merge branch 'doc-case-fixes' into develop
Fix readme bullet list
Merge branch 'fix-readme' into develop
Merge branch 'develop'
Add webadmin to default LoadModule for testing.
Merge branch 'flavioamieiro/develop' into develop
-added necessary support for serverside management of channels for each connector. No REST api support for editing yet however
-set default channels for fitbit to Fitbit.steps and Fitbit.caloriesOut
-set default channels for picasa to All.photos
-removed default channels from clientside connector configuration
-changed Timeline tab to use the channels provided in the digest model to select channels to display
removed empty and unused function from Connector
added support in ConnectorStore for retrieving channels and setting them
fixed bug where a connector's channels could not be updated
trying to update a connector not enabled ona  user's account will return failure now
Merge remote-tracking branch 'fluxtream/master'
Define __STDC_LIMIT_MACROS=1 on the g++ command line.

 This is needed when using jstypedarray.h, even from outside SpiderMonkey.
 The definition needs to be on the command line since <stdint.h> uses
 this macro definition to modify behaviour and <stdint.h> may be included
 well before jstypedarray.h is ever used.
set artifacts to open in new window
refactor svn:externals to support relative path
Merge remote-tracking branch 'jedifreedman/master' into feature/jedifreedman
Merge branch 'feature/jedifreedman' into develop
Item11267: No,, we need to use version 0.77

It seems the only sane way to get to modern perl version strings that
are usable, printable, comparable,  is to require minimum version 0.77

Before version 0.77,  "v" style strings cannot be quoted to be useful as
versions, but cannot be printed unless quoted.

Version 0.77 shipped with Perl 5.10.1,  Older versions that must be
upgraded shipped starting with Perl 5.9.0.

git-svn-id: http://svn.foswiki.org/trunk/InterwikiPlugin@16013 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
force underflow
Fixed trailing spaces on SchemaTool
Passed column options to the join column
run all callbacks in next_tick
Update Code/Library/Kernel/Process.h
link color in toc is black
metacity-2.34.13-1-x86_64
* version bump
gucharmap-3.6.0-1-x86_64
* Version bump
libpeas-1.6.1-1-x86_64
* Version bump
gedit-3.6.1-1-x86_64
* Version bump
maximize coverage of dk.softwarehuset.projectmanagement.app
Add App.Helpers namespace.
basic NHibernate asp.net infrastructure
Etiquetas "code" no marcan en color las distintas partes del código

fixes #348
Fixed a minor typo
First fork, and made some changes
First fork, and made some changes
Added readme
Fixed a typo
Fixed 'What is a set?' bulleted list
Fixed a conflict
Update index.mdown
Updated with more background knowledge links
Added more external links
Minor updates to teaching philosophy section
Added more external links, minor fixes
Added more external links, minor fixes
Updated the section levels, minor cleanup, added inline assessment
Merged in Tom's changes
split up and organized index.md into smaller pieces
Added git.md to include links to walkthroughs
Fixed brokenness in git.md
Added external links
Unbreak professor.md
fixed typo
merged branch bamarni/patch-1 (PR #390)

Commits
-------

b7c1d49 fixed typo

Discussion
----------

fixed typo
prep 0.1.4"
add archive capabilities to backup
Merge pull request #1 from gimler/master

change preg_split to explode
add travis build status from @gimler fork
Tuning up NFJS notes
GitHub.com login is a class pre-requisite
Use locally stored theme list
Properly plays intervals
Shipping To updates correctly
Removed superfluos code
Enter start and end times as formatted string
Do nothin on invalid range inputs
Range formatting
Removed no longer relevant messaging
* Refactor de updateSection (découpage en sous méthodes)
Reading in dynamic number of snapshots
made the controls box look a bit fancier
its a little nicer without the harsh white
shifted admin and ontology sub headers to partials using multiple yields and content_for
perspective belongs_to node
Made nodes load, with their perspective when requested via URI e.g. /node:node_name

this involves passing the node data in data fields in the view, and
altering the init process of scene_controller to check for this first.
just added a little squeeze
implemented a default node attribute
the home action now loads the default node
Reverse zoom direction (to be like google earth) and made zooming hide the tooltip
added the ability to decode and display perspectives from the URL parameters
scene controller can now load the perspective specified in the url parameter, if supplied and valid

défaut behaviour is to attempt to load url specified perspective first
added seed data for an admin user
admins scope
fixed crash when no parameters in url
url updates automatically as required, fixed a few bugs with storing and loading the perspective url parameter
can now use browser back and forward functionality to navigate app states, plus numerous tweaks and fixes for related features.
back and forward work for nodes also now

the back and forward features seem to be fairly solid now
fixed thing -> forwarding to not rely on incidental parallel ids
removed console spam
fixed path error
Add PCB for heli
add 'client' flag to Attachment#toJSON
includes urls in attachment JSON when pass the 'client' option
Merge branch 'to_json'
Updated smart-query to offer more fields
release changes
gitignore update
Fix single nick aliases (Zannick).
updated letter format
The git repo is confused. Unconfusing
Unconfused now git?
allow multi-param lamdas
a publikus oldalaim és privát oldalaim részt ki kéne szedni a menüből

- a publikus oldalaim és privát oldalaim részt ki kéne szedni a menüből
(egy csomó olyan portlete pakolhat be, amiben lát neveket…)
Fixes an exception when the log is empty
Adding a test when log is nil, also rendering an empty string instead of nil
list support
list support
commit to resolve conflicts, refs #190
Merge branch 'master' of github.com:gwu-libraries/launchpad
used conditionals to handle index out of range errors, closes #162
Test autodeploy, take 2
README.rdoc
features/invitations/dan_invites_pat.feature
features/pitches/pat_pitches_dan.feature
update js linking to use onClick
link to minified script
changing js linking to onClick
rename displayHistoryStack() and add more info to the output
incude a minified version for v1.1
update to include v1.1 refrerences
remove old script
update to v1.1
- include "_ac" before all method names and public variable names
Fixed user_prunes patch
Using the MIT license.
Distinguish case while auto-complete.
Modify ruby syntax entry, and add font lock constant face for new hash syntax.
Update several vendors, and switch auto-complete to the emacsmirror repo.
KHRES-303 #comment rename HONCode Directory to HONcode Directory
Program to draw structures evolved by EurekaOptima implemented.
Don't need to call .name on route here
Fix loading of drives when multiple hosts are involved
cleanup AS7-4021
"add other putative libraries"

This reverts commit 391eb60c7b151ca04fb8171d687211ae5ce9f2fd.
update where() method
Switched urlMap with defined - urlMap was removed in require 2.0.2
改对白

11
fixed bug

FYI
Update pom to latest plugins
HHH-7349 HHH-7344 : Element collection mapped with lazy=true is non-lazy; correct headers for metamodel tests
Version down rack
fixed expression in topics/files.txt
Modify ldconfig after installing ImageMagick. Create symlinks for rmagick.
Add apache plugins for munin.
Updated HelloBot
Merge branch 'master' of github.com:hubiquitus/hubiquitus4j
Merge branch 'master' of github.com:hubiquitus/hubiquitus4j
Merge branch 'master' of github.com:hubiquitus/hubiquitus4j
Added support for basic logger
Nuevo Action Bar
Revise mongoose post.  Streamline release tasks
Initial commit of codeigniter files
initial codeigniter files unzipped
Merge branch 'hotfix/sept-updates' into live
Merge branch 'release/pse-alpha-theme' into live
added Laura PSE update theme changes
fixed map render being one frame behind model render
Force FAKE build-step for Mono/xbuild (only) to force copy of dependencies.
Added tests directory which is for CxxTest test suites meant for starting to get the simulator covered by unit tests.
Added a test script in the matlab code that plots the pe, ke, and total energy of a simulation result.  It is just as wrong as the C++ code (fortunately?).   This is getting brutal.
Meant to put these two in the last commit.
Changed get_current_R to reflect that R_jts rotates from the base linke to the top link coordinates, the later of which is the coordinate frame for the current link.  Also Changed the way gravity is applied, but I do not think this is correct.
Fixed forward_kinematics.m: It was not calculating linear velocities for the first link at all.
Found that the mass matrix was not using the inertial frame vector from joint to cm.  This is now done in the tip_to_base loop instead.
Small changes.
Small changes in matlab sim.  Single module energy conservation is good, but multi module is no good.  Do not get it yet.
rename README to README.md
change README.md to Markdown format
fixed 0.9
Added missing anubis_parser.py
Giggery pokery.
Factor out VCSCommandGetScratchBufferName() from s:SetupScratchBuffer().

This separates the two responsibilities and allows extensions to look up an existing VCS log scratch buffer.
annotate scratch buffer: Start with all folds open; we want to see the annotations.
Enhancements for annotate command.

- Fix for :VCSAnnotate! doesn't split annotation correctly with selection=exclusive.
- Reuse the current split annotate windows when the configuration says so.
- Better name (including the version) for the split annotate header window, so that it is very similar to the annotate window.
added 2d views

test
I've updated the project configuration so that we can run the tests from this branch.
When a parameter is inferred, it's OK to set it to something else.

R=johnlenz
DELTA=27  (24 added, 0 deleted, 3 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5334

git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2133 b0f006be-c8cd-11de-a2e8-8d36a3108c74
Remove references to passes when we're done with them. This appears to
relieve memory pressure a bunch

R=johnlenz
DELTA=44  (43 added, 0 deleted, 1 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5335

git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2134 b0f006be-c8cd-11de-a2e8-8d36a3108c74
TT: Adds js interfaces

R=pedronunes,cttsai


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5336

git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2135 b0f006be-c8cd-11de-a2e8-8d36a3108c74
Fix may-use data flow analysis in the presence of ON_EX edges.
Fixes issue 794

R=acleung
DELTA=43  (42 added, 0 deleted, 1 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5337

git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2136 b0f006be-c8cd-11de-a2e8-8d36a3108c74
Add a heuristic for figuring out the type of an inferred variable
that is read across multiple scopes. This isn't perfect, but it should
catch a lot of common cases.
Fixes issue 726

Tested:
yes

QA: yes

R=johnlenz,dimvar
DELTA=254  (211 added, 17 deleted, 26 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5338

git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2137 b0f006be-c8cd-11de-a2e8-8d36a3108c74
moe re-sync of r2129 and r2130

Revision created by MOE tool push_codebase.

R=johnlenz
DELTA=8  (7 added, 0 deleted, 1 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5339

git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2138 b0f006be-c8cd-11de-a2e8-8d36a3108c74
coba-coba git
Added a scale control as well as putting a white drop-shadow around the scale and mouse position controls in order to be able to see them against a dark background
Fixed NuSpec
rgraphviz test
Merge branch 'HEAD' of git@github.com:ivanhanigan/disentangle.git
acroreader
added information about the cryptoparty. changed some meeting details for the 11-3 meeting
add mongodb support for player save.
Reverted to older css.

The "cleaning up" caused an error I was unable to locate.  I reverted back to a working clean copy of the CSS file.
updated theme, added fragment code, will now add json manifest stuff
added some actual content
Merge branch 'master' of github.com:jamesporter/dashboarder
Added SoundManager
Added Button features
Adding tag page to parser

- Adding a new method to parse tag pages
- Replacing "-" with a space in the tag from url
- Renaming parameter in parser to better reflect purpose
Add option to skip transcoding existing files
support interaction arg matching the same way as all other expectations
added mdown syntax to README
fix memory leak in test app
Update gitignore for coverage.py
Add a test about squared distances
minor changes in a docstring
updated the readme to reference 'django_blog' instead of 'blog'
Added command for launching the server console
Multiselect list used by Inspect graph
Locate the legend for Inspect graphs at the bottom of the graph. Use a multiselect list to select which series are plotted. make the colors in the inspect graph consistent with the originating graph.
Merge pull request #79 from pcpiela/master

Relocate Inspect Graph legend
Added stylesheet for multiselect list
Fixed an issue with single item lists
Merge pull request #80 from pcpiela/master

Fixed Inspect graph issues
Cleaner
Add rspec and rake to dev deps
Count messages
Fixed duplicate work items trying to get resubmitted 10 times instead of
just returning.
Merge branch 'master' of
https://jclawson@github.com/jclawson/hazelcast-work.git

Conflicts:
	src/main/java/com/succinctllc/hazelcast/work/executor/DistributedExecutorService.java
Added metrics to WorkRebalanceTask
Moved ready member checking to the ClusterServices class
Updated mocking to generate documentation properly
Changing HTML logic: t+
Changing HTML empty element logic
Changing HTML empty element logic
Changing config file format: t+
updating timeline indicators whenever slides are moved
Removing unnecessary whitespace and <defs>.
adding autoplay query parameter
minor tweak to demo inc. autoplay from external link
Sync embedded videos with master timeline.
Say what the unexpected element name is.
Database project file added by Red Gate SQL Source Control
Added SP to view Report Server Subscriptions -JAG
Added WhoIsActive and the Ola Hallogren backups scripts.
All of the assembly
Merge branch 'master' of github.com:jgibson5/comparch-final
3dtargets
Minor tweaks of text metadata tab.
Hiding the notes, small bug fix
refer to varable when calling `put`
`if/else` expression
some comparasion
now fibonacci works
Last sync failed. Recommit

It was probably because I was working at the same time.
Adding xlr, db, and other aliases
yott
MAKE IT MY OWN
servlet apps
Bug fix: In submenu mode, reload of a single feed.
Not again ಠ_ಠ
renane gcm_device to device
enable/disable editor
fixes
default to SCT_UNKNOWN if string is incorrect
scrap pi_lua_table_ro, which has always been broken

"Broken" meaning: it completely failed to do its job.
add pi_lua_readonly_table_proxy and use it for the Lang.GetDictionary result

This replaces pi_lua_table_ro, but this one actually "works". It's still
not ideal, because a read-only table doesn't work properly with the Lua
standard library "next()" function, but it should work for most other uses.
make _create_constant_table a little clearer
use read-only proxies for the public (global) Constants tables
Merge remote-tracking branch 'johnbartholomew/lua-readonly-tables'
remove redundant commented-out thing
fixing jquibs.html
remove negative vspace in title
LPS-27436 when serviceParameterTypes is StringNull it grabs wrong methodAndParameterTypes from cache
LPS-27436 cache key should not be generated from parameter names
LPS-27436 replace string+ with StringBundler for key
LPS-27436 using parameter names for logs (as before) since types can be empty
LPS-27436 Source formatting
LPS-27299 Log level pagination using wrong iterator tab
LPS-27483 Files with UTF-8 filenames cannot be downloaded in JBoss AS 7
LPS-27483 Source formatting
LPS-27238 Spaces for tabs
LPS-27492
LPS-27492 Regen
LPS-27171 Use a Glassfish specific variable instead, both work, but can be more confusing
LPS-27485
LPS-27485
LPS-27485
LPS-27485
LPS-27485
LPS-27485
LPS-27485
LPS-2855 service builder builds <entity>Clp class incorrectly when <entity>Impl overrides a method in <entity>ModelImpl
fixed ~200 warnings for windows
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7293 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
fixed orb bug commited by mistake

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7294 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
fixed compile error

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7295 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
minor fix : doesn't save outliers 

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7296 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
updated optical flow demo : added PyrLKOpticalFlow support

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7297 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
added docs for GoodFeaturesToTrackDetector_GPU and PyrLKOpticalFlow

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7298 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
#1283, Mat <->Bitmap converters are updated to support CV_8UC(1,3,4) & non-continuous Mat-s and RGBA_8888 & RGB_565 Bitmaps; Android samples project files are updated according to the latest SDK req-s.

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7299 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
moved finding CUDA_npp_LIBRARY to OpenCVDetectCUDA.cmake

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7300 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
#1283, Mat <->Bitmap converters Java tests.

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7301 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
#1283, adding JavaDoc comments for Mat <->Bitmap converters.

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7302 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
Created a perftest for convertTo, updated perftests for arithmetical operations

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7303 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
fixed and updated gpu implementation of separable liner filters
now it supports kernel's size up to 32

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7304 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
removed highgui video tests execution on macos; also minor code changes

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7305 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
fixed compilation error

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7306 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
fixed compilation for old compute capabilities

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7307 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
fixed a few problems detected by Xcode 4.2.1

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7308 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
added color canny; improved Algorithm class implementation

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7309 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
added StereoVar description (by Sergey Kosov)

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7310 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
Added the GPU version of the Farneback's optical flow

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7311 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
Added missing files

git-svn-id: http://code.opencv.org/svn/opencv/trunk@7312 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
added mallet and tokenizer
- hwm 100
- some style fixings
- Display rate for debugging
Be more thorough about warnings: -Wextra -Werror

Adds -Wextra and -Werror to CFLAGS to make warnings actually matter
make distclean currently throws an error

Fix make distclean by adding -f to the rm command
Merge pull request #1 from igalic/cleanup

Build cleanup
Improvements to commenting and documentation.
* Commenting improvements.
* Minor code improvements.
* Almost fixed replay prevention.
Got all security measures working. Need testing though.
Button: Add <desc>
Dialog: Cleanup
fix duplicate copy(cherry picked from commit 4a1972ee77adb52164bd3a3b158fb1a807948b6f)
Syntax fixes to make grunt work
Merge pull request #148 from dmzza/events

Syntax fixes to make grunt work
[maven-release-plugin] prepare release hiscores-1.6.9
provides for accurate csrf tokens in the even that the cart form requires protection
Added base resistors. Moved LED resistors to second board.
sqllite in dev
Initialized
Merge branch 'master' of https://github.com/julieReitter/Split-Task
Adding in missing definition of proxyHandler
dom iteration, append init event
added console interface
capture the access points around the scanner to help with geolocation
lietuvinimas apmokejimo valdyme1
Small changes to Parser and Generator
doc update
use stat64 on 32 bit
remove old stat structures that are not used now
implement directly some more termios functions. grantpt was giving valgrind errors
Highlighting is now implemented in Markdown instead of HTML. Most importantly, that allows comments which contain Markdown syntax to be appropriately rendered in search result pages. In addition, fixed a bug that allowed highlighted text to remain unescaped if the text wasn't actually highlighted.
Imported Upstream version 15B02
Merge tag 'upstream/15B02' into pkg-debian

Upstream version 15B02
changelog updated.
Some instructions.
Updated outdated gemspec
Some servertesting.
ちょっと長い文章も書けるようにしたい
他の人のblogのeditボタンを表示しないようにした
add packages files
oops, use real domain and not localhost
Introduce a small logger.

Introduce a small logger to ease debugging of the Android port.
Introduce the changes needed for Android.
Added some features to track data
Added xml rules and removed parenthesis magic
Fix cpufreq exceed max scaling frequency
mali: set initial value of gpu boost to 0 to fix panic on recovery combo
Change defconfig
GPU Boost on touch, hardkeys and touchkeys
Modify & Fix CPUFreq
Linux kernel version patch 3.0.30 -> 3.0.31
Fix the bash script layout
Version bump to 0.0.2
Added more events support:

- switched to using OJ gem for faster json parsing and serialization
- added CRUD for events
tweak readme
Merge branch '1.0'
Update agenda to latest slide design
Update to latest Remark
Fix bad example
testing decision table
Merge branch 'master' of github.com:kklimuk/vooga-framework
two enemies
two enemies
Added Concrete Item Class
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
KukaPlayer: Set gamma correction to 1.0 instead of 2.2

Will still simulate the computational load of color correction, but
without messing with the test movies colors.
LOTS OF CHANGES
+ pluginBattles now creates sub-nodes in menu for each battle; this is
  just for testing really just to demonstrate it is functional
! fixed reference to module Session in response to capitalization
@ adjusted spinning boxes on session panel to scale better with
  the window size so as not to become behind the text boxes
- removed the rendering of a randomly choosen map as the background
  for the session plugin panel as it sometimes made it hard to see
  and it ate a lot of CPU may replace later and adjust brightness to
  make it easier on the eyes
+ added CHANNELTOPIC handler into lobby Session module
Update to feed
hard links, e.g., data.geo.whitelist = data.geo.dictionary
#9 big refractoring due to changing IDE

Signed-off-by: kornicameister <kornicameister@gmail.com>
#9 library files, so I do not need to download it anymore

Signed-off-by: kornicameister <kornicameister@gmail.com>
#9 refractored

Signed-off-by: kornicameister <kornicameister@gmail.com>
fix #43 company setting is working pretty well,
but there must be a bug opened for not processing
response

Signed-off-by: kornicameister <kornicameister@gmail.com>
#9 refractored after chaning IDE

Signed-off-by: kornicameister <kornicameister@gmail.com>
show body text in portlet
revered back to enumerate due to extend problems with [class*
Update Transcendence/TSUI/CCloudService.cpp
Added succesMsg to block user/auction
contacts icon for 7.2
+self link
+css opacity change
Probleme a faire spawner les lignes pas sur elles, je vais devoir checker ca
Site Start - Construction
DB ajustada con el usuario de pruebas
Working forum with breadCrisps after add
UPDATE: Added Custom Corners
Correct getList and setList
exchange function implemented and tested. partition function implemented (need some tests).
added a login method to use stored procedure
now uses the setValues static method
Adds toString definitions on DTO models
SelectItem replaces SelectTask/Item/Group/Project
Fix a bug in rpc-handler and format codes
Merge branch 'release/0.12.1' into develop
Fix a json-formatter related bug
Chanage version
Merge branch 'release/0.12.2'
Fun ссылка на "нездоровые" паттерны (#69)
Some small fix for Android ICS, relates to #9
Merge branch 'master' of github.com:bobuk/kittycheck
Попытка номер 2
Попытка номер 2
Leon Cockpit UI change
* fix centering canvas in center of mainwidget ..
Bump license.
Loosen faraday and multi_json version restrictions.
Fix Github URLs
Merge pull request #33 from tomhukins/fix-readme

Fix Github URLs (thanks, Tom Hukins!)
Mostrando el nombre y apellido en vez del usuario
Realizado el pago o el abono
Better subtab handling: also fire when there are no top-level tabs
fix css.js for 2.2.0
v2.2.1
Implement internal_memmove.
Use internal_memmove() and internal_memcpy() in the memcpy() and memmove() wrappers
when building the dynamic runtime (OS X only), to work around a bug in resolver functions wrapping.
See also http://code.google.com/p/address-sanitizer/issues/detail?id=116



git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@165939 91177308-0d34-0410-b5e6-96231b3b80d8
Removed the _ in the Bundle name so we stop getting warnings.
Some more README fixins, also deleted sample.conf. Also fixed an import bug in the xlib plugin
Release version 221
Criei uma classe com métodos comuns
Sixiao's changes
vdr-skinnopacity-9999.ebuild now demands at least vdr-1.7.33
added vdr-tvguide-0.0.1
first integration with wiiremote controller
UPD Update my CV
MIN List LCSB talk
Arreglar el Memory Leak

-Devolver variables de funcion U.ds() a que sean variables de clase
-Poner variable de funcion U.dibujarLineasColision() como variable de
clase (esta era la que estaba ocasionando el memory leak)
-Quitar mensaje de log
Documentacion de funciones y clases. Quitar clases que no se usan.
Refactorizacion de funcion de colisionPiso()
screwed up the md syntax
フォント変更
軽微な変更
バグ修正
quickmenu追加
Rework Todo as some singling BuildRequires is completed.
created a new mode rpm mode which will be derived from either
"fundamental" or "sh" or "c" mode
Lets' try travis.
Set up configurable folders based on ini settings
Merge branch 'master' into cleanWorking
fixin last merge
before pulling alex ui updates
stupid git just merg it
freenect dll
Merge pull request #4 from jlyons871/master

merging is sooo fun 
Merge branch 'master' of https://github.com/alexiswolfish/AiVDJ

getting fonts from alex
Reimplemented push
Geet | Anirudha : xforms module
Performance Build DB from git commit 824e61baa3fc8e3f4fba0eea4df69d01450b5cc2 using node bob
Performance Build DB from git commit cea15660da7fe902c0de0f543636093d6c6d98b6 using node bob
implements account name with validation on confirmation
modifiche chieste oggi
added some more queries
agrego aplication.rb
change jqueryui theme
Slow down with those URLs already

Typos, typos everywhere!
added example config and initialization files
Add link to categories view
Merge branch 'master' of github.com:marktabler/store_engine
master - adding search_api_solr
changed something in the InfoActivity.java
refactor attachments table, form, controller
[spec] make validation spec pending
[fix] admin school edit from show
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop

Conflicts:
	core/app/views/gaku/admin/schools/show.html.slim
	core/spec/requests/admin/schools/schools_spec.rb
	core/spec/requests/syllabuses/exams_spec.rb
More refactoring for students view
[fix] edit forms inpit with presents are empty
[fix] country and state association
WIP : Refactor syllabuses views
WIP : Refactor class_groups views
Refactor course_groups views
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
WIP : Refactor courses views
[fix] course group disposals
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[view] unproper appending
WIP : Refactor exams views
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop

Conflicts:
	core/app/views/gaku/exams/exam_portions/_edit_modal.html.slim
	core/app/views/gaku/exams/exam_portions/show.html.slim
[fix] student chooser for class group
[refactor] exam portion nested under exam folder
[fix] new exam portion link don`t disapear
implemented draw circle
Tabla compras agregada a Administracion.php
Put the manifest in the validator output.
Ripped out the stuff I found from the perfalator
restrictive domain working
added new terrain and sounds
Merge branch 'master' of https://github.com/matthewhardnack/Survive
Deleted extra sounds
View user's leaderboard
Merge pull request #43 from ronyv89/master

Added feature to view user's leaderboard
Revert "Webstie Update"

This reverts commit d37bf436124de75a9c32da7c697940a6eece06ac.
Revert "Webstie Update"

This reverts commit 1fe1cf163a585ce1c7e84350b47d3ab5d7bb7be5.
Removed get_child from the sheep ai
Merge branch 'master' of https://github.com/mattsc/Wesnoth-AI-Demos
Added pdf extension lib with auto sizing based on width.
Refactored DummyTriangle handling
Add Blubrry and Podtrac tracking services (Fix #63)
Update MediaElement.JS to 2.9.5
Language Problems when Adding Podcast From Frontend (Fix #71)
Product thumbnails: normal font-weight
001 results for 100-body
archive 2body results
remove old result files
Ticket #859: Do not notify users about things that happenned before their action
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop
Add wording for saving draft updates #876
Assignment done for World map
Merge pull request #3 from malclocke/adds_greater_less_and_contains_assertions

Adds greater, less and contains assertions
Merge branch 'master' of https://github.com/busterjs/buster-assertions into abandon_git_submodules
add: speakers
add: speaker
fix: speakers photos
MSTTEST
merge Merge branch 'master' of https://github.com/mengshuaishuai/GitLearn

Conflicts:
	practice.txt
Adding flex properties file to share config settings with other plugins
Fichiers ignorés ajouté
u knwo wat
Added test for "oneBy" magical finder
Added configurable option for :unknown.
seznammap: card for markers added
seznammaps: conflict
regionOverset test
Change to interface{} to support bigcouch
Commit demo
Merge branch 'master' of https://github.com/minh10huy/HiringBossCRM
Partie V.0.0.0.7.2

- Ajout d'une nouvelle épreuve dans fonctions.
- Correction d'un bug (pas d'affichage) dans fonctions.

Signed-off-by: Minoru Kokubunji <gael75014@gmail.com>
added german sitemap
Added more link parsing
Fixed 404
Выполнен рефракторинг файла Axis_cmd.lsp.
scenario level metric input export working
'migration' job to add job level inputs to exports
css, image added
style changes
Fixed code blocks to look like code blocks
Fixed http://-handling
Modify all graphics
added gitignore and created a sublime project for local dev
Merge remote-tracking branch 'origin/master'
Tightened up the  if/then check in is_lb, and removed extraneous parameter from opt.
Review Search Controls, Implemente Delete Token Service, Review Design at TableViewControl
Trigger a "dialogDisposed" event when a dialog is closed. bugid:108182
Save and restore caret position around inserting asset. bugid:108171
The real test of file readbility is to try open it, bugid:106632
Modified styles of editor dialog.
Bug 813277 - Unable to long-tap hold on the home-screen to invoke the wallpaper menu r=smaug
Bug 769743 - Bump the XDR version because bug 769743 forgot to do it (rs=waldo)

--HG--
extra : rebase_source : c7abd9ab7a12d14577a81caaf3a0fac8802269b2
Bug 809766 - libsoundtouch does not build. r=khuey
Bug 754432 - Let Thunderbird have access to ContactService.jsm and ContactDB.jsm. r=fabrice.
Bug 770461 - Robocop: delay click on 'Today' until list population verified; r=jmaher
Bug 758258 - Part 1 - Create skeleton for extendedOrigin tests. r=sicking
Bug 758258 - Part 2 - Add GetExtendedOrigin(), NO_APP_ID and UNKNOWN_APP_ID. r=sicking
Bug 774957 - Update nsDocShell jazz so distinction between browser and app frame is clearer. r=jlebar sr=sicking
Bug 770831 - Make nsIDocShell carry the app id. r=jlebar sr=sicking
Bug 750544 -  Remove the scope bar from the Library window. r=mano.
bug 811382 - update OTS library to r.95. r=jdaggett a=dveditz
Bug 806534 - Support regular expressions in extension id for blocklist entries. r=Mossop
Bug 812380 - optimize less aggressively in TraceWeakMapping. r=billm
Bug 769791 - Optimize nsSelection::GetIndicesForInterval for adding ranges to the end. r=smaug
Bug 770628 - Add mozglue to b2g packaging. r=mwu
Bug 752341. Avoid using CGContextSetTextMatrix. r=bgirard

CGContextSetTextMatrix has behaviour that depends on the text
drawing mode. We want consistency so avoid CGContextSetTextMatrix.

--HG--
extra : rebase_source : c6e46252823586d947ec1dd19db7df980dee23f8
Bug 705046 - Disable the chunks of test_html5_tree_construction_part2.html which touch plugins and thus expose our brokenness on 10.7, so we can unhide the rest of the mochitest-5 suite, r=hsivonen
intellectual base code.
Visualizing image transformed to closest color works
Merge branch 'master' of github.com:mprat/breadboard-to-pcb
Forgot to add cluster.py last time
Moved the functionality to log errors in the database to the main module
- Deleted a bunch of methods in the ErrorHandler class.
- Created the main/ErrorDBLogger model and hooked it to the 'before_module_execution' trigger.
Minor Changes to the framework
- Removed the $dbServices parameter in the Dispatcher::loadServices method. No need for this.
- Instantiate the DummyUser class when displaying messages in the ErroHandler::display. method.
- Changed visibility of some methods in the TemplateHandler class.
- Minor changes to the main/ErrorDBLogger model.
- Fixed minor issues in the main/Minify model when having a pre tag inside a textarea.
- A minor change in the prepareUrl function. We have to transliterate based on the charset.
bash-for-hipsters: Switch order of command line prompt items
Added RenderSystemDesktop implementation (has only some shader related methods for now).
Some other smaller changes.
Add test directory
Merge branch 'master' of https://github.com/mschneider59/cinematiko