labofsahil/github-event-dataset-2012 huggingface dataset:
Indes Galantes 1735 : les sauvages, scène 2
added some error and success log
version bump to 0.2.0
version bump to 0.2.1
Update notes for submitted changes

* rtos: Use ARRAY_SIZE instead of coding it by hand
add .gitignore file
add assets js, css, img
add testings makeup
new version with fixes of different database.yml on server
Typo: oder -> or.
Merge pull request #8 from Grahack/typos2

Typo: oder -> or.
publish 868444b8632b32d358e90219c2c4db5e0254310a
Add newAlarm event and use to update main form
Store alarms in collection and use to update UI

Event in NewTimeEvent did not update MainForm UI when the NewTimeEvent
was spawned from the context menu as MainForm was not subscribed. Now UI
is updated when an alarm is added to the ObservableCollection.
linux-eee-ck: bump to 3.3.3
further integrate matth's design
Submit scope
Windows: Dir Invalidation Notify Current Object

When an invalidation is processed for a directory object,
send the notification on the directory object that was invalidated
not its parent.

Reviewed-on: http://gerrit.openafs.org/7642
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 349c1f53383ee26eb13729d703b0b9e89865ec0c)

Change-Id: I162834f5e33540ee5503fd6b0a6d319da47c8f7e
Reviewed-on: http://gerrit.openafs.org/7695
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
viced: avoid crash if missing volume header

Avoid a fileserver crash if the volume header is
missing in SetVolumeSync.

Change-Id: I509081306402fc7147d0624aa1181330b9fa9fc5
Reviewed-on: http://gerrit.openafs.org/7301
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
libafs: initialize free dcache list for memcache

reuse the disk cache dcache creation code for memcache, then
call it to prime the list

Change-Id: If63268aa1a89c9642236f944e1ac8328d68aeba5
Reviewed-on: http://gerrit.openafs.org/7446
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
Windows: AFSDevControl print control if exception

Change-Id: If94ba4f265d943ec8e4852c3d8c88d59cef3ef9b
Reviewed-on: http://gerrit.openafs.org/8599
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: fs getcalleraccess

Implement VIOC_GETCALLERACCESS and associated 'fs getcalleraccess'
for Windows.  Varies from the Unix implementation in the following
ways:

 * getcalleraccess supports the -literal switch to permit
   querying rights of symlinks and mount points

 * multiple files can be provided on a single command line

The VIOC_GETCALLERACCESS pioctl returns the user access rights
and the anyuser access rights.

Change-Id: I75f636956bbafcc91144b44bd2d7729b8643605c
Reviewed-on: http://gerrit.openafs.org/8598
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
pam: Use the right password variable in pam_sm_chauthtok()

"password" is known to be null at this point.  Use "prompt_password"
which is obviously the one intended.

Change-Id: I4ab566f93c4978438df2c2875d619177ad8f5bdd
Reviewed-on: http://gerrit.openafs.org/7892
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
LINUX: Avoid symlink-y resolution limits

Implementing the d_automount or follow_link function pointers for our
directories means that we can hit symlink resolution limits during
lookup, since we look like a "symlink". We can hit these limits pretty
easily if there are just too many directories in the lookup path.

Our pseudo-symlink directories cannot contribute to an infinite
resolution loop, since our destination is always an actual directory,
not a symlink that will result in more redirection. So, decrement the
total_link_count counter when our d_automount or follow_link code is
reached, so we do not contribute to hitting the max resolution limit.

Note that this is not related to recursive symlink lookup (link_count)
but only to the iterative symlink limit (total_link_count). Our
lookups are not recursive here, and we are not causing more recursive
lookups like a normal text-based symlink would do.

Change-Id: Id6d2edd614388ac0890eb7591caec25d375964ce
Reviewed-on: http://gerrit.openafs.org/8009
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
ptserver: Make ptclient build again

Make the ptclient utility build again, and add it to the ptserver
Makefile so that it is built by default and, hopefully, won't
bitrot again.

Change-Id: I888a9d4392b62ecb2d7556694400a2853658052a
Reviewed-on: http://gerrit.openafs.org/7841
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
Windows: Use MountRoot for Absolute Symlinks

Replace the absolute symlink processing in AFSLocateName().
Implement AFSIsAbsoluteAFSName() to test whether or not the
path is in fact an absolute /afs path by comparing the input
string to the registry MountRoot value which specifies the
case sensitive root path for all absolute symlinks stored
in the AFS cell.

If a symlink target path begins with a directory separator
and is not an absolute afs path name, return an error.

Construct the substitution string using the target path
without the MountRoot prefix.

Add functionality to AFSRedir.sys to read the MountRoot
from the registry and pass it on to AFSRedirLib.sys.

Reviewed-on: http://gerrit.openafs.org/8353
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit ba718cba9285fc9f663b0fd15524bc5474cca893)

Change-Id: I374885151f7186c509927a16fde0fcb493340881
Reviewed-on: http://gerrit.openafs.org/8359
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
fix crazy verion number for moses (!?)
cleanup OACMock file distribution craziness

Must not copy binaries into the source directory.
Avoid errors when copying non-existant files.
SoftCamSetup with ECM Display
Fix pep8 issues in test_memcached.py.

Change-Id: Ieeee2411f84489ea106909e18e758fd170aa9bca
Merge "Fix pep8 issues in test_memcached.py."
Remove double GET on range requests.

The proxy server's ObjectController was performing multiple GET
requests to the object server when processing requests with Range
headers. This was a workaround for a bug in the proxy server's
Controller.GETorHEAD_base method where a response code of 416 from the
object server was incorrectly treated as a bad response from the
backend, the same way a 404 or a 5xx would be.

A 416 (Requested Range Not Satisfiable) from the object server is now
considered a good response. Since the response headers from the object
server already include the X-Object-Manifest header, there's no need
to make a second request (sans Range header) to see if the object is a
manifest.

Bonus fix: updated message for status 416 to match RFC2616.

Bonus fix 2: removed a leftover debugging print() in
test/unit/proxy/test_server.py.

Fixes bug 1065869.

Change-Id: I156af0b463f02ef19a8cfe37092544a599d89b78
Merge "Remove double GET on range requests."
Refactored HTML + CSS for the admin template header
Increased padding of .ctb-inner to 15px
Improved how .ctb-content width was calculated
Fixed bug where some content was 2px wider due to border
".frm-row-header h1" replaced with ".frm-row-heading"
use ID in hook email
fixed unsubscribe in emails
updated string core, fm and modern theme
updated string in modern folder
updated gui folder
removed unused files from gui folder
Update manual/closing-task.md
AML Parser: Fix two possible memory leaks in error path.

Fixes a couple of memory leaks in the error recovery path.
Jesper Juhl, Lin Ming.
Add commented-out CSS to force zebra-striping.
Minor changes to be PEP-8 compatible
Renamed command list by status and added new tests
Fix typos and tests
Added css and javascript include changes to page.html
cart stuff
cart stuff
adding pixel between f galleries
Installed devise and generated Users model
* Accidentally broke it. Now fixed
* Changed title, db config
* Still not working
* the view with a form
Updated ffi-rzmq to 0.9.5
rbenv bootstrap fix
Entered Greek text from P.Rain.Unterricht 68

 - Created from SoSOL template
 - Entered Greek text from P.Rain.Unterricht 68

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
Rename Text from 'papyri.info/ddbdp/sosol;2012;0653' (DDB_EpiDoc_XML/sosol/sosol.2012/sosol.2012.0653.xml) to 'papyri.info/ddbdp/p.rain.unterricht; ;68' (DDB_EpiDoc_XML/p.rain.unterricht/p.rain.unterricht. /p.rain.unterricht. .68.xml)
Update header to reflect new identifier 'papyri.info/ddbdp/p.rain.unterricht; ;68'
Update revisionDesc

 - Vote - Accept-Straight-to-Finalization - accept (Lajos Berkes)
 - Finalized - ready (Lajos Berkes)
Fixed links, commented more, made CSS external.
Images
New External CSS file for core.html
Some rendering fix for mac os x
Layout adjustments
Games#index grid view
Fix devise routing
Game view improvements
Implement image uploads for cover art
Add placeholder cover image
I noticed that the frame rate overshoots its setting of e.g. 100 FPS when vertical sync gets disabled. It takes a short while for the frame rate to stabilize, which in my opinion is a flaw. Since I was the one committing this code to the Cinder core, I feel it is my responsibility to correct this issue. I have decreased the frame skip period from 1 seconds to 3 frames. I have also simplified the calculation of the next frame time.
Further simplified the frame rate limiter.
This is more like it!
Cleaned up the code sample.
Add referrer tracking for gaug.es.
also scrape moogaloop URLs
Update manpages
Merge branch 'master' of git.debian.org:/git/collab-maint/dputng into hooks-merge
Updating for gcc-4.7
Fixed find_issues logic.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10905 e93f8b46-1217-0410-a6f0-8f06a7374b81
Set version to 2.2.0.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10906 e93f8b46-1217-0410-a6f0-8f06a7374b81
Explicitly load dependencies for when running with config.threadsafe! (#12097).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10909 e93f8b46-1217-0410-a6f0-8f06a7374b81
Make the tests pass when config.threadsafe! is enabled (#12097).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10910 e93f8b46-1217-0410-a6f0-8f06a7374b81
Makes User.current thread safe (#12097).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10911 e93f8b46-1217-0410-a6f0-8f06a7374b81
Fixed dependency loading for when running in dev mode (#12097).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10912 e93f8b46-1217-0410-a6f0-8f06a7374b81
Removed unused instance variable.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10913 e93f8b46-1217-0410-a6f0-8f06a7374b81
Replaces find(:all) calls.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10914 e93f8b46-1217-0410-a6f0-8f06a7374b81
Load RMagick before the gantt helper (#12097).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10915 e93f8b46-1217-0410-a6f0-8f06a7374b81
Replaces find(:all) calls.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10916 e93f8b46-1217-0410-a6f0-8f06a7374b81
Replaces find(:all) calls.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10917 e93f8b46-1217-0410-a6f0-8f06a7374b81
Replaces find(:all) calls.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10918 e93f8b46-1217-0410-a6f0-8f06a7374b81
Replaces acts_as_tree #roots class method with a scope.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10919 e93f8b46-1217-0410-a6f0-8f06a7374b81
Replaces find(:all) calls.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10920 e93f8b46-1217-0410-a6f0-8f06a7374b81
Replaces find(:all) calls.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10921 e93f8b46-1217-0410-a6f0-8f06a7374b81
Adds helpers for retrieving my page data.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10922 e93f8b46-1217-0410-a6f0-8f06a7374b81
Restores acts_as_tree instance methods removed in r10919.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10923 e93f8b46-1217-0410-a6f0-8f06a7374b81
Replaces find(:all) calls in classic_pagination.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10924 e93f8b46-1217-0410-a6f0-8f06a7374b81
Replaces find(:all) calls.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10925 e93f8b46-1217-0410-a6f0-8f06a7374b81
Preserve the "from" parameter in activity links.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10926 e93f8b46-1217-0410-a6f0-8f06a7374b81
Fix tests to be more isolated and clear lists between each run and ensure they are loading what is necessary to run the test
Removes a number of static setup tests from unit tests
Fixes svn 18691

Issue#: CODE-1906


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk/pcgen@18695 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Move ClassSkillList selection to a Facet

Issue#: CODE-1907


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk/pcgen@18862 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Ensure any uncaught exceptions are recorded in the pcgen.log file.

git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@18292 b6a209e6-650d-0410-972b-dadffa731f64
Fix Loop Condition

Bring 3.x Core Sets to newer Standards
Issue#: DATA-739



git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@18293 b6a209e6-650d-0410-972b-dadffa731f64
Knights-N-Knaves - Full Permission Granted
Issue#: PR-11


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17521 b6a209e6-650d-0410-972b-dadffa731f64
Update Spells in RSRD to have full details
+ PrettyLst run
Issue#: DATA-658


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17770 b6a209e6-650d-0410-972b-dadffa731f64
Hide export log messages

git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17771 b6a209e6-650d-0410-972b-dadffa731f64
PrettyLst Run on Basic Set

git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17772 b6a209e6-650d-0410-972b-dadffa731f64
Regroup character integration tests by game mode.

git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17773 b6a209e6-650d-0410-972b-dadffa731f64
added stride functionality
bugfixes in version 3
Merge branch 'master' into debian

Conflicts:
	gtk3plot/gtkplotpolar.c
gtk3 fixes
Ignore malformed input instead of segfaulting
Implement a proper datafile saving routine.

This causes any malformed input lines to be discarded.
Evaluate keys only once
Change Simulation signature, proposal for #838
Use regular default maven folders, close #839
Merge pull request #840 from excilys/mutable-simulation

Change Simulation signature, close #838
Remove useless implicit conversions
sum/fact(orial) util functions
Fixing coding mistakes in the Skeleton
Marsvin will not provide anymore one directly interface for Cilex
Adding use of class Response in the skeleton
Fixing error in the process

In the method process the anonymous function was trying to access a
protected variable from the AbstractLayer
Fixing mistakes in the name of listen the events
- added class instantiation to bootstrap.server-process as described in #69
- adopted fakePackageJSON trick from @jhnns like described in #62
- removed old leaked-schmarrn
Fixed compilation with QtWebKit < 2.2 and AKN plugin.
Fixed bad behaviour of QWebPage on leaveEvent.
- when leaving web widget, QWebPagePrivate generates fake
  mouse move event, but unfortunately with bad coordinates.
  So sometimes it just hovered a link and the link's url got
  stuck in status bar message.
Update Japanese translations.
Fixed conflicts
Fixed conflicts
Updated Indonesian translations. Add new translation for plugins
section.
Fixed toggling WebInspector. It now shows correct inspector everytime.
bugfix: reinstate adapter free AbstractDataClient
Reaction class was coded and used with macro-xs calculations

A reaction is simply a functor that takes a particle as an argument and
change the particle's state. The reaction is sampled with the Sampler
class, which is a generic template that will be used to sample stuff
along the code.

Also, the keff algorithm was coded on the "main" and apparently is
working fine.
add hipster image
allow appendices for showing up popup explanations
Updates info and formatting.
added hazelcast dependency
Revised (or fixed :)) scaling approach
Revised database and configuration layers
* Modified Configuration class: is now a singleton
* Added Database class: implemented as singleton
* Moved database functionality to Database layer class
fixes update on security settings. added more migration scripts
fixed a bug of device part
fixed a tabbing bug. For some reason, local scope of a function can mess with the scope of the calling function by accident. Fuck javascript, seriously.
Builders language file fix
Translatable areas

Translatable Template table gui title, gates gui title, still and moving
oil (in NEI) (and added Oils to en_US.properties)
build.xml
fix path
Merge pull request #251 from Flow86/patch-ant

Patch ant
correctly save and restore hasPulsar()

tested by saving and restoring a std. aut. gate.
Merge pull request #256 from AartBluestoke/newb

correctly save and restore hasPulsar()
place the actual block consumed, rather than what is in the template

in almost all cases there is no difference, but there have been reports
that mod items with inventories get the inventories duplicated. this
should fix that.
Merge pull request #260 from AartBluestoke/master

builder places the actual block consumed, rather than what is in the template. Closes #5
Merge pull request #249 from krisavi/Buildstuff

Builders language file fix
Cleaned up a bunch of unneeded imports. Clean up your stuff before doing PRs please!
Updated the build xml to download the required jars for the "getMethod".
Also made it copy the localization files.
Refactored build.xml
Forgot to change the command in readme
Merge pull request #262 from psxlover/Build.xml

Build.xml
Synch powerAverage on laser entities. Partial fix for #263
Removed incorrect optimization for landmarks and path markers.
Added bottles as a water container.
Fixed PathMarkers.
It was using EntityLaser while a recent commit changed the renderer to work on EntityPowerLaser.
Also the EntityLaser wasn't syncing the texture (another partial fix for #263)
Also both the client and the server threads were manipulating the available pathMarker list. Now only the server side tiles are added.
Finally synced the state of the pathMarkers (whether or not they are searching for a new marker to connect)
Removed some useless code
artf500239 fixed to generate build number in Iphone projects
Se incluye la carga de nbd en los nodos de computación
version ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1936 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Custom CSS styles for disabled numeric fields applied to wrong tag

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1937 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
changed empty check in Pimcore_Placeholder

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1938 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
some site improvements & code cleanups (new tool functions)

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1939 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-870 - Create database transactions -> not completely finished

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1957 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
moved clearDependendCache() into save method (asset,object,document) + changed update() method to protected (document)

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1958 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Org Switcher initial changes.
Check for current user.
Org switcher movement and Administer button movement.
Removing orgs from top level menu.
system groups - update views to use _tupane_header partial

This change will place the headers in a single partial for reuse.
Merge branch 'master' of github.com:Katello/katello into orgswitcher

Conflicts:
	src/app/stylesheets/katello.scss
	src/app/stylesheets/widgets/multiselect.scss
	src/app/stylesheets/widgets/scrollpane.scss
819002 - Removing password & email validation for user creation in LDAP mode
system tests - optional xml logging
Can be used for better view of test results via ResultNG
Merge pull request #219 from pitr-ch/fix_broken_unit_test

Fix broken unit test
customConfirm - add more settings and refactor current usage

This commit contains some modifications to the customConfirm
action to provide the user a little more flexibility in it's behavior.
The changes include, ability to specify a secondary warning message,
setting the text for the yes/no buttons and adding an optional
cancel button.  (These changes were not previously needed; however,
they will be useful to support the System Groups deletion.)

This commit also contains the changes to the current users to
use the new 'settings' object to pass input to the customConfirm.
system groups - ui - provide user option to delete systems when deleting group

This commit contains changes to allow the user the opportunity to delete
the systems in the group when deleting the group itself.
Merge remote-tracking branch 'upstream/master' into fork-group_delete_systems
Merge pull request #221 from bbuckingham/fork-group_delete_systems

system groups - provide user oppty to delete the systems in a group when deleting the group
Merge pull request #213 from jsomara/819002

819002 - Removing password & email validation for user creation in LDAP ...
katello - asynchronous manifest import in UI
system groups - cli/api - provide user option to delete systems when deleting group

With this commit, the user may provide an optional parameter (--delete_systems)
to cause all systems to be deleted when the group is deleted.

E.g.
system_group delete --org ACME_Corporation --name=group1 --delete_systems
Merge remote-tracking branch 'upstream/master' into fork-group_delete_systems
katello - fix gettext wrappers
Merge pull request #222 from pitr-ch/asynchronous_manifest_import

katello - asynchronous manifest import in UI
Merge pull request #218 from tstrachota/system_test_log

system tests - optional xml logging
dabaopku-test/hello-world.txt
Merge pull request #1 from dabaopku-test/master

dabaopku-test pull request
Define $modulekit_load to load additional modules
group-same and only-same flags
timelinerをsubmoduleとして追加
minor improvements to prefer a named road over an unnamed one if within 20 meters, also #1856 ability to control preferred name for highways, county and state roads (whether numbered or local name)

git-svn-id: http://svn.osgeo.org/postgis/trunk@9861 b70326c6-7e19-0410-871a-916f4a2858ee
Fixed incorrect use of RASTER_DEBUGF().

git-svn-id: http://svn.osgeo.org/postgis/trunk@10432 b70326c6-7e19-0410-871a-916f4a2858ee
Revert "Revert "Added zindex options to dropdown so we can make sure it presents itself on top of whatever is existing in the DOM""

This reverts commit 67bccff4d468dab5889dc61c55ea5819bc423c4b.
細かな修正とusecase追加
Shifting the skeleton module to ./utils/ and updating the console app to pass in a custom path
correlation modifier
semantic matching
Added code to limit the number of points per series for graph
Poole -> Prose
missing inc
something's wierd
added auto-complete and pymacs
added pony-mode for django
Added solution to programming question 5
Update README.md

remove mention of autoloading user pack
Merge branch 'master' of https://github.com/overtone/emacs-live
Modificado o nome de alguns campos
removing crap docs
Refactor Popen print-and-capture a bit
Fixing UTF-8 problem with mail and minor glitch with unix_user
Fixing an issue with fields from different namespaces getting confused.

The all_fields class had not been converted to be namespace specific, so the formatting data might get mixed up with fields of the same slug (just the formatting data, not the actual data).
Merge branch '2.1/develop' of github.com:/pyrocms/pyrocms into feature/files
fixed a broken variable
Option --ruby19-hashes added
Force using Ruby 1.9 hash style attributes when possible.
Add-on for link mark numbering to twittering-mode
emacs 23/24 switch stub
Fixing buffer list sorting in workgroups to not lose buffer history ordering
Indentation fixes
Added platform font selection function (for new frames under emacsclient)
Added more options
Removed haskell mode (not using it right now)
Added js2-mode settings
Added new personal directory for org mode lookups
Added eval and replace function
Added twittering-mode settings
Removed yasnippet (not really using it)
Removed auto-mode for haskell (since I'm not using it right now)
Fixed to get emacs24 to load (missing inversion from cedet?!)
ERC hack for channel join/leave preferences
el-get applications installed on emacs24
member function works better when you actually use a list
Changed loading location of cedet
Added erc-clear-buffer function, since actually clearing with /CLEAR being (recenter 0) is apparently clearing to /someone/.
Made todochiku icons 32x32
Added buffer-move
Fixed paren matching to not happen in erc (emoticons, mostly)
Fixed show-parens to only activate and highlight in programming modes
Removed extra eval-and-replace
Lots of changes from going through the norang.ca org-mode tutorial again
Agenda mode highlights line
Start using org-indent
Habits hidable but reshow in morning
添加client.html
add android client
add onclose reconnect
[BUG #6988] fixing some broken links
fixing param type 'function' -> 'Function'
Minor doc fix.
Minor.
[BUG #6959] Vendor specific CSS names are now handled correctly, also in
IE
bugfix whjen no class given
Include unistd.h to get some system function declarations

Some corrections of doecumentation and comments.
Merge branch 'master' of https://github.com/wernerd/ZRTPCPP
Release 0.7.2
Bump after release
Flipped corners
cleanup / login
added config
poprawione fixtures
add rule engine starter, rule engine fine repository
doc: add missing <pre>s
doc: remove needless '=='
added eliot
Fix wrong module type for tag_input
fuck the haters
Merge branch 'master' of https://github.com/razfar/smash.js
i fixed a thing
added small constant to occu likelihood
cleaning up gene lists
fixed json dirs and files response
corrected scope of function
cleanup
cleanup templates and events
checking to see if user has picture and profile link before including in whoami
added mongodb interface
configuration based mongodb uri
cleanup imports
Merge pull request #35 from hrovira/master

added mongodb integration + minor fixes
delete statusfile when monitoring
Give monkey a putchar/puts/printf API.
We need to power up usb on cold boot
C style line endings
Removed deprecated processing chain.
Spyral Explanation started
Added first letter support and stub for anagram support
Removed public visibility modifier.
Added toString method.
add vld to server's testrunner.exe
add lost files
Merge branch 'master' of https://github.com/reallongda/vnoc
Merge branch 'master' of https://github.com/reallongda/vnoc
删除旧文件
更改文件名
更改路径，移至旧路径下
Add -proxytoo option, which allows proxy use non-exclusively, unlike the -proxy option.

Conflicts:

	src/init.cpp
	src/netbase.cpp
Fixes Issue #1234 - re-issues getblocks when current node providing them disappears.

Conflicts:

	.gitignore
	src/main.cpp
	src/net.cpp
	src/net.h

Conflicts:

	src/main.cpp
	src/net.h
Show the timestamp for the block.
Display when SIGTERM received (or any signal, for that matter) in debug.log.

Conflicts:

	src/init.cpp
Improve debug.log output.

Also, rename AlreadyAskedFor to AlreadyWaitingFor (makes more sense, as can cease waiting, but cannot stop having done a past thing.)

Only display peer if fLogPeers is set, for privacy purposes.

Conflicts:

	src/main.cpp
	src/net.h
Display in status bar when a longer invalid chain exists.
Enable the code that deals with replacement transactions.
Increase Max Connections from 8 to 125.
Merge branch 'MaxConnections125'

Conflicts:
	src/main.cpp
Try new connections every 30 seconds rather than every 2 minutes.
Allow blocks to be downloaded from multiple nodes. First commit.

TODO: Deal with stuck downloads so the same block can be downloaded by another node. Perhaps keep count of the re-asks. Log these.
More verbose output by default. Be less choosy with Block Providers.
Merge remote-tracking branch 'origin/ParallelBlockDownload' into ParallelBlockDownload.reb

Conflicts:
	.gitignore
	src/addrman.cpp
	src/db.cpp
	src/main.cpp
	src/net.cpp
	src/net.h
	src/netbase.cpp
	src/walletdb.cpp
Merge branch 'ParallelBlockDownload.reb'
Merge commit 'f0e396b95b34dbb364ec8ef5be374b35b55e0464' into HEAD

Conflicts:
	src/main.cpp
	src/net.h
Merge branch 'ParallelBlockDownload.reb'

Conflicts:
	src/main.cpp
Fix new-transaction modal to refresh on success
Fix bad query strings on some searches
Fixes test templates for plugins.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9737 e93f8b46-1217-0410-a6f0-8f06a7374b81
code layout clean up test/integration/routing/repositories_test.rb

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9611 e93f8b46-1217-0410-a6f0-8f06a7374b81
scm: fix git and mercurial branch list box action

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9612 e93f8b46-1217-0410-a6f0-8f06a7374b81
GH #38: add relevance user for ssh glory
Added .ci script.  Added dev info to README.
Fixed (so far unused) return of char_store().
things commented out
Merge branch 'master' of git@github.com:rete/IsingModel.git

Conflicts:
	main.C
updated few login bugs
jabberbot.core: fixed some bug of bug fix.
Some changes
.
GAH! embarrassing spelling mistake
check for empty products table instead of reports table to see if import has already run
bug 749462 - crontabber support for puppet
detab
made roles.sql idempotent
bug 751731 - assume roles.sql is idempotent
Merge pull request #561 from rhelmer/bug751731-roles-idempotent

Bug751731 roles idempotent
Merge pull request #540 from rhelmer/bug749462-add-crontabber-config-puppet

Bug749462 add crontabber config puppet
RF-12344: upgraded Mojarra to 2.1.13
Updated picturedemo
filtering out colophon from the site map.
Remove right-click menu from filesystem search results, remove $PATH completion, adds icons based on content type
- never should have had the print statement in there
MDL-34691 assign: Time remaining "Assignment is overdue" was incorrectly being displayed when a student viewed a submitted assignment after the due date.
MDL-34795 completion: Add course_completed event
MDL-34866 - Make "course display" default a site configurable option
MDL-32759 Assignment 2.2: Changing grade for existing assignments will show warning that grades will not be scaled
MDL-32759 Assignment: Grades will not be scaled for new assignment module, and added warning message for user
MDL-34870: Prevent cohort enrol sync when updating course record
MDL-34535 message: userto should use is_number instead of is_init
MDL-34429 - lib - Changed the log downloads to use the new CSV class.
MDL-34872 Backup: Backup does not fail when a user is deleted
MDL-34866 - Make "course display" default a site configurable option

* Moved COURSE_DISPLAY_SINGLEPAGE and COURSE_DISPLAY_MULTIPAGE constants from courselib to moodlelib.php
* Using course display constants in course default admin setting page
MDL-30370 mod_forum - Removing duplicate seleted field in the DB query

Credit to Iñigo Zendegi
MDL-31810 - Fixing unclosed DIV tags throughout Moodle
MDL-33362 book: Parse links to book modules from 1.9 backups
MDL-34377: Fix: assignments overview page shows a unset due date as Epoch and counts draft submissions
MDL-29847 question preview: garbage collect old preview data.

This adds cron code which looks for question previews that have not been
touched for more than 24 hours, and deletes them.

We try to delete previews immediately. For example if the user clicks
start again, then we immediately delete their previous preview. However,
we can't do that if they just close the preview window. Hence we need
some cron code to clean up old preview that have got left lying around.

Normally, this code will not have much to do, so it will be very fast,
so we can afford to run it every cron.

This has been implemented in such a way that in future it will be easy
to add other cron code to the question bank.

Sadly, to make this work on MySQL, we require a horrible hack in the
already hacky delete_usage_records_for_mysql function.
MDL-32705 backup ui: add select all/none JavaScript on schema screens
MDL-34810 question bank: user prefs for some display options

The options that are remembered persistently are
* Also show questions from sub-categories
* Also show old questions
* Show question text in the question list
* Number of questions per page
MDL-34889 phpunit: progress output in util.php --drop.

It is slow for me, and it is nice to know that something is going on.
MDL-34702 quiz DB: questiondecimalpoints has wrong default.

Thanks to the folks at UCL for tracking down this problem. It has only
hidden for 2+ years!
MDL-34934 general: Delete unnecessary .gitignore
Removed spaces and linebreaks between <a> and <img /> </a> to prevent uglyness around the thumbnails.
add support for serializing java lists
Close the streams
bump version
schedule tasks sent a fiber to be run sequentially in a separate thread - supports re-entrant actor behavior for scalang services
add timer metric for term encoding
better comments and reorganized code a bit
Merge pull request #6 from rnewson/close_finally

Close the streams
Changed xb to xB for rasm. :)
fixed a bug, which led to a forkbomb if connection is lost
Nya testklass templates

Templates är för Activity klasser för att implementer tester i dessa
MainActivity
CreateNewPlayer
GameActivity
UserActivity
Jag har lagt in Anas kod för nivå 2 med min kod för nivå 3, lagt till
läsning från fil, och gjort några kosmetiska ändringar till game.xml.
Nivå 2 och 3 går att spela, men man måste sätta difficulty manuellt i
Game då knapparna i Main är inte fungerande än.
Pdf filer är också uppdaterat och upplagt.
directory structure changes
using autotools
Switch to Google Test framework for unit tests
Готов график
Переделка финальной страницы на js
Таблица оценок переписана на js
changed recent.R to geo_recent.R
added myself
Port to python3 with modernizer and six.

Note - the rubric_stats script doesnt yet work in python3.  Not a priority.
added self to students, added blog to planet, added two swap extensions to .gitignore
Merge branch 'master' of git://github.com/ryansb/hfoss into develop

Conflicts:
	data/students.yaml
	planet/config.ini
Added name and details to the file, my information is up to date.
Updated entries, error in yaml file, added profile to config.ini
Merge branch 'master' of https://github.com/WillDignazio/hfoss into develop

Conflicts:
	data/students.yaml
	planet/config.ini
Notes for teaching python.
Lightning talk number 1.
Added functions example.
Updated my info in students.yaml and planet file

Updated students.yaml and planet/config.ini with my information.
Cleaned up some whitespace issues.  Oh YAML..
Update data/students.yaml
Bumped stuff down we didnt finish.
More details for intermediate python.
Next time.
We should also talk about nose and sqla.
A little more instruction for Linux/OSX
Added myself to the students.yaml file and my blog to the planet
config.ini
Merge branch 'develop' of https://github.com/ajman1101/hfoss into develop

Conflicts:
	data/students.yaml
	planet/config.ini
Add integration test for List, including work on base integration test class
Add a .npmignore before publishing
adding php5-gd to php reciepe
Added the orientation feature to an image. The image can be rotated by
multiples of 90 degrees and or flipped horizontally or vertically. This
is required by the MythImage plugin. Refs #183.
Added the orientation functionality that is supported by the exif
orientation tag. Besides rotating it allows the user to vertically and
horizontally flip the image. This information is also saved in the
orientation column in the database. Refs #183. Requires the libmythui
changes in commit 5499defb.
Merge branch 'master' of miroku.no-ip.com:/var/git/mythtv
accept inherited ActiveRecord classes for #activerecord_class= method
tweaks to make diagnostics work correctly on windows
reorganizing type sigs
fix link
Merge pull request #30 from banyan/fix-link

fix link
Adopt XEmacs 21.5.32.
xemacs: Fix build on Lion.
let f scripts run relative to some dir
Add relative ability to kf
add kfr to run kf in relative mode
added empty constructors (for GWT)
A static method providing feedback for core added.
final touch on versioning profile and bashrc
changing diag required for tablet formfactor
page_num sync
Updated application example; moved help methods in own class
Added helper class
Add owner filter w/ @rwdaigle syntax
Fix comment.
Better flash message style.
Fixes for various bugs in uid fetch
only normalize .pre/pre here (user should include normalize.css if they want all of 'em)
Fix throwing error; Refs #6576

git-svn-id: http://svn.boost.org/svn/boost/trunk@79919 b8fc166d-592f-0410-95f2-cb63ce0dd405
Make sure at least one Boost header (and therefore Boost.Config) precedes std lib headers so that defines in boost/config/user.hpp are seen by system headers.
Fixes #7009.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79152 b8fc166d-592f-0410-95f2-cb63ce0dd405
Pass the correct argument to make1breakcycle and make sure that we don't add a spurious self-dependency.

git-svn-id: http://svn.boost.org/svn/boost/trunk@78252 b8fc166d-592f-0410-95f2-cb63ce0dd405
Added retransmit logic
Merge branch 'master' of github.com:ryscheng/WebP2P

Conflicts:
	plugins/chrome/js/bkg-nacl.js
	plugins/chrome/js/test.js
	plugins/chrome/src/nacl_transport.cc
query naming
Add Polish translation (with reduced character set).
Validate the values read from totals9.sab
layout page modify 2
Moved test functionality into a separate app
Merge pull request #41 from jaytaph/object

Moved test functionality into a separate app
- fixed ugly bug in parsing the FMT string (combinations of variables with strings) - even if the string was passed as str (pointer+len), the internal code was still looking for null terminator :P...
- the "stat" variables may accept in names any combination of strings and other variables -> dynamically named statistic variables. Ex: $stat(attempts_$var(gw_id))
Stop Tlist auto open
Remove settings that are not required
Unable heavy omni completion
libkml: fix build with clang by removing "-Werror" from Makefiles (#33104)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95685 d073be05-634f-4543-b044-5fe20cf6d1d6
php5-uuid: update to 1.0.3 (#35092)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95686 d073be05-634f-4543-b044-5fe20cf6d1d6
arb: enable GL; see #33926


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91682 d073be05-634f-4543-b044-5fe20cf6d1d6
mpich2: Update master_sites; add openmpi conflict.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100070 d073be05-634f-4543-b044-5fe20cf6d1d6
scite: update to 3.2.2 (#35922)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97262 d073be05-634f-4543-b044-5fe20cf6d1d6
lilypond-devel: update to 2.17.1


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97263 d073be05-634f-4543-b044-5fe20cf6d1d6
libwpd: update to 0.9.4 (#35917); use xz distfile; rewrite master_sites to avoid redirects; fix livecheck; remove unnecessary --mandir configure arg


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97265 d073be05-634f-4543-b044-5fe20cf6d1d6
libwpg: update to 0.2.1 (#35919); fix license; use xz distfile; rewrite master_sites to avoid redirects; fix livecheck; disable -Werror to fix build with clang


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97266 d073be05-634f-4543-b044-5fe20cf6d1d6
libvisio: new port, version 0.0.19 (#35921)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97267 d073be05-634f-4543-b044-5fe20cf6d1d6
yum: add python27 variant, make them conflict


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91163 d073be05-634f-4543-b044-5fe20cf6d1d6
yum: python27 variant didn't work, revert r91163


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91164 d073be05-634f-4543-b044-5fe20cf6d1d6
sox: mark conflicting with the play port (fixes #29522)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91165 d073be05-634f-4543-b044-5fe20cf6d1d6
octave-vrml: correct worksrcdir (#35979) and license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98809 d073be05-634f-4543-b044-5fe20cf6d1d6
devel/tig:
- Bump to 1.1
- better checksums
- removed unnecessary reinplace


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98810 d073be05-634f-4543-b044-5fe20cf6d1d6
fix bug #61065
(cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68)
fd fix
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fd fix
  fix bug #61065 (cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68)
Merge branch 'PHP-5.4'

* PHP-5.4:
  fd fix
  fix bug #61065 (cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68)
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3

* 'PHP-5.3' of git.php.net:/php-src:
  Fix for bug#62046
PHP 5.3.15-dev
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  PHP 5.3.15-dev

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.4'

* PHP-5.4:
  PHP 5.3.15-dev
- BFN
- Fix NEWS
Fix handling of several uinitialized intl objects
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix handling of several uinitialized intl objects
Fix handling of several uinitialized intl objects

PHP 5.4 specific changes. Not having this in the merge commit helps
porting to pecl/intl
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix handling of several uinitialized intl objects
  Fix handling of several uinitialized intl objects
  - Fix NEWS
  - BFN

Conflicts:
	ext/intl/dateformat/dateformat.c
Fix handling of several uinitialized intl objects

Master specific changes. Not having this in the merge commit helps
porting to pecl/intl
Whelp. I should check my HTML _before_ I push.
minor visual tweak, added generator from toby, fixed for current version esoTalk, revert prev change to popups
build 20120917
Refactor find_action_class using a cached map.
Add include_json Rspec::Helper
[fixes #31376805] Add RootResource

Add a table of content (available models and actions) to the root page of the server.
Merge pull request #19 from maxigit/31376805_add_root_resource_encoder

31376805 add root resource encoder
Remove absolute pathing from function definitions
Automatically generated installer lang files
MDL-34448 - mod/data - Fixing separate groups viewing all entries.
Automatically generated installer lang files
Automatically generated installer lang files
Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE
weekly release 2.1.8+
fields
Merge branch 'master' of github.com:scarytom/pronet
coda-cli 1.0.3

Closes #12405.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Update path of nagios-plugins

Change path from sbin/nagios-plugins to sbin in order to avoid hacks in
related formulae.

Closes #12181.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
gst-ffmpeg: fix clang compile error

GST-ffmpeg comes bundled with an internal ffmpeg that suffers from
the known issue of a hardcoded gcc unless the right configure arg
is thrown.  When building with clang, the hardcoded gcc in the
libav subdirectory causes an error where gcc doesn't recognize
`-march=native`.  GST-ffmpeg offers a configure flag to fix that.
Add a flag to use our ENV.cc.

Fixes #12312

Closes #12390.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
weechat: make bindings optional, patch to fix perl

The weechat saga continues...  This commit makes all the language
modules optional rather than the default.  It adds a dep on guile
if the user options for that module.  It adds a patch from HEAD
to fix the perl segfault on exit and a removal comment for 0.3.8.
This commit does not patch the ruby-1.9.3+rvm issue other than
not building that module by default.  Still waiting on the
upstream patch.

cf. #12377

Closes #12392.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
dnscrypt-proxy 0.9.4

Closes #12343.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
dnscrypt-proxy: remove broken HEAD

The GitHub checkout needs an autotools bootstrap. Patches welcome to
enable it, but removing it until then.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
wiggle 0.9

Upgrade wiggle to version 0.9.
Patch OSX compile errors using the developer's git repo.
Patch two functionality issues released the day after 0.9.
Include patch removal information in the comments.
Remove the `malloc` patches.  They are fixed in this version.
Remove the `-w` from cflags lets the developer use `-Werror`.
Use our `cflags` and `-g` rather than `-ggdb` to support clang.
Add the `test` make target (~2sec) to verify the build because
we are trusting wiggle to do complex patching.

Closes #12305.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Merge branch 'master' of git://github.com/mxcl/homebrew into tiger
quicky to get the list of current root server addresses
[close GH-3] Fixed engine plumbing
Version bump to 0.1.1
Regenerate gemspec for version 0.1.1
Optionally allow the user to specify the center of gravity in a force directed graph.
File uploads work and create correct handover rows.
NPC 23598 - Backported From SD2
SCI: Hopefully fix bug #3565505 - "SCI : crash when loading a savegame"

This bug occurs because in the cases specified in the bug report, the main
loop hasn't run fully yet, and there is a mini loop running instead (e.g.
inside Print())
Hopefully, this catches most cases where the crash occurs, but it needs more
testing to find if there is any other such case.
COMMON: Make CoroutineScheduler's constructor and destructor private.

CoroutineSchedule is a singleton, thus it should not be possible to create
a custom instance of it.
Added more dot files.
Update git user.
Fixed bashrc.
Merge branch 'hotfix/remote-gitconfig-add-conky-add-bash'
add sourcing of local zsh config
Changed hello.cpp in branch 1

Change-Id: I9d6f547c5aaf15a7ab8678888435e3d6f95bdd28
Changed hello.cpp in Branch2

Change-Id: Id147bb29a34dea36ddb4ace0e6cb444e77214e14
Merge branch 'Branch2'

Conflicts:
	hello.cpp
Hello.h changed to test rebase

Change-Id: Ia5f7833057012e9dd29ac82155723b7a8885dc2c
Some coding in a branch

Change-Id: I624e6677ad04a63aac7091758d9fe07ca03cb5ba
Signed-off-by: Marko <Marko@Marko-PC>
Add background gradient to body.
Fixing my error
Implement functions for "Cancel" & "Save" buttons in "Add Friend" view.
Integrating mocha with grunt
Adding the link-grammar conditions
Adding testcases for LinkGrammar integration in QuerParser.
Made slight tweak to how the keyboard resigns when scrolling on tableview occurs